diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index 0f8c03aa6a..ed56f1cc09 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -1437,17 +1437,19 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 						break;
 				}
 				
-				// If an item file URI, get the property URI
+				// If a .zip file URL, get the .prop file URI
 				var deletePropURI = this._getPropertyURIFromItemURI(deleteURI);
-				// Only nsIURL has fileName
-				deletePropURI.QueryInterface(Ci.nsIURL);
-				
-				// If we already deleted the prop file, skip it
-				if (!deletePropURI || results.deleted.has(deletePropURI.fileName)) {
+				// Not a .zip file URL
+				if (!deletePropURI) {
 					return;
 				}
-				
+				// Only nsIURL has fileName
+				deletePropURI.QueryInterface(Ci.nsIURL);
 				fileName = deletePropURI.fileName;
+				// Already deleted
+				if (results.deleted.has(fileName)) {
+					return;
+				}
 				
 				// Delete property file
 				var req = yield Zotero.HTTP.request(
diff --git a/test/tests/webdavTest.js b/test/tests/webdavTest.js
index 0cf25d466d..28c240a5cf 100644
--- a/test/tests/webdavTest.js
+++ b/test/tests/webdavTest.js
@@ -1008,6 +1008,8 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 				},
 				text: '<?xml version="1.0" encoding="utf-8"?>'
 					+ '<D:multistatus xmlns:D="DAV:" xmlns:ns0="DAV:">'
+						
+						// Orphaned files to delete
 						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
 							+ `<D:href>${davBasePath}zotero/</D:href>`
 							+ '<D:propstat>'
@@ -1035,7 +1037,6 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 								+ '<D:status>HTTP/1.1 200 OK</D:status>'
 							+ '</D:propstat>'
 						+ '</D:response>'
-						
 						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
 							+ `<D:href>${davBasePath}zotero/AAAAAAAA.zip</D:href>`
 							+ '<D:propstat>'
@@ -1054,9 +1055,28 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 								+ '<D:status>HTTP/1.1 200 OK</D:status>'
 							+ '</D:propstat>'
 						+ '</D:response>'
-						
 						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
 							+ `<D:href>${davBasePath}zotero/BBBBBBBB.zip</D:href>`
+							+ '<D:propstat>'
+								+ '<D:prop>'
+								+ `<lp1:getlastmodified>${beforeTime}</lp1:getlastmodified>`
+								+ '</D:prop>'
+								+ '<D:status>HTTP/1.1 200 OK</D:status>'
+							+ '</D:propstat>'
+						+ '</D:response>'
+						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
+							+ `<D:href>${davBasePath}zotero/BBBBBBBB.prop</D:href>`
+							+ '<D:propstat>'
+								+ '<D:prop>'
+								+ `<lp1:getlastmodified>${beforeTime}</lp1:getlastmodified>`
+								+ '</D:prop>'
+								+ '<D:status>HTTP/1.1 200 OK</D:status>'
+							+ '</D:propstat>'
+						+ '</D:response>'
+						
+						// Orphaned files that aren't old enough to delete
+						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
+							+ `<D:href>${davBasePath}zotero/CCCCCCCC.zip</D:href>`
 							+ '<D:propstat>'
 								+ '<D:prop>'
 								+ `<lp1:getlastmodified>${currentTime}</lp1:getlastmodified>`
@@ -1065,7 +1085,7 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 							+ '</D:propstat>'
 						+ '</D:response>'
 						+ '<D:response xmlns:lp1="DAV:" xmlns:lp2="http://apache.org/dav/props/">'
-							+ `<D:href>${davBasePath}zotero/BBBBBBBB.prop</D:href>`
+							+ `<D:href>${davBasePath}zotero/CCCCCCCC.prop</D:href>`
 							+ '<D:propstat>'
 								+ '<D:prop>'
 								+ `<lp1:getlastmodified>${currentTime}</lp1:getlastmodified>`
@@ -1125,6 +1145,16 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 				url: 'zotero/AAAAAAAA.zip',
 				status: 204
 			});
+			setResponse({
+				method: "DELETE",
+				url: 'zotero/BBBBBBBB.prop',
+				status: 204
+			});
+			setResponse({
+				method: "DELETE",
+				url: 'zotero/BBBBBBBB.zip',
+				status: 204
+			});
 			setResponse({
 				method: "DELETE",
 				url: 'zotero/lastsync.txt',
@@ -1137,9 +1167,19 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 			});
 			
 			var results = yield controller.purgeOrphanedStorageFiles();
-			assertRequestCount(5);
+			assertRequestCount(7);
 			
-			assert.sameMembers(results.deleted, ['lastsync.txt', 'lastsync', 'AAAAAAAA.prop', 'AAAAAAAA.zip']);
+			assert.sameMembers(
+				results.deleted,
+				[
+					'lastsync.txt',
+					'lastsync',
+					'AAAAAAAA.prop',
+					'AAAAAAAA.zip',
+					'BBBBBBBB.prop',
+					'BBBBBBBB.zip'
+				]
+			);
 			assert.lengthOf(results.missing, 0);
 			assert.lengthOf(results.error, 0);
 		})