diff --git a/chrome/content/zotero/xpcom/connector/server_connector.js b/chrome/content/zotero/xpcom/connector/server_connector.js
index 30e2261612..8e50e6708f 100644
--- a/chrome/content/zotero/xpcom/connector/server_connector.js
+++ b/chrome/content/zotero/xpcom/connector/server_connector.js
@@ -1135,7 +1135,7 @@ Zotero.Server.Connector.SaveSnapshot.prototype = {
 		}
 		
 		try {
-			let item = await this.saveSnapshot(targetID, requestData);
+			var item = await this.saveSnapshot(targetID, requestData);
 			await session.addItem(item);
 		}
 		catch (e) {
@@ -1143,9 +1143,15 @@ Zotero.Server.Connector.SaveSnapshot.prototype = {
 			return 500;
 		}
 		
+		let attachments = [];
+		let hasAttachments = !item.isAttachment() && item.getAttachments().length;
+		if (hasAttachments) {
+			attachments = [{mimeType: "text/html", title: data.title, url: data.url}];
+		}
+		
 		return [201,
 			"application/json",
-			JSON.stringify({ saveSingleFile: !data.skipSnapshot && !data.pdf })];
+			JSON.stringify({ saveSingleFile: !data.skipSnapshot && !data.pdf && data.singleFile, attachments })];
 	},
 	
 	/*