diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js
index 98e2007f3f..e1e71ca915 100644
--- a/chrome/content/zotero/xpcom/data/items.js
+++ b/chrome/content/zotero/xpcom/data/items.js
@@ -959,7 +959,6 @@ Zotero.Items = function() {
 			let annotations = fromItem.getAnnotations(includeTrashed);
 			for (let annotation of annotations) {
 				if (annotation.annotationIsExternal) {
-					await annotation.erase();
 					continue;
 				}
 				annotation.parentItemID = toItem.id;
@@ -967,15 +966,6 @@ Zotero.Items = function() {
 			}
 		}
 		
-		if (toItem.isFileAttachment()) {
-			let annotations = toItem.getAnnotations(includeTrashed);
-			for (let annotation of annotations) {
-				if (annotation.annotationIsExternal) {
-					await annotation.erase();
-				}
-			}
-		}
-		
 		// TODO: Other things as necessary
 	};
 	
diff --git a/test/tests/data/duplicatesMerge_annotated_2.pdf b/test/tests/data/duplicatesMerge_annotated_2.pdf
index 4bba84e415..fab0d38d61 100644
Binary files a/test/tests/data/duplicatesMerge_annotated_2.pdf and b/test/tests/data/duplicatesMerge_annotated_2.pdf differ
diff --git a/test/tests/data/duplicatesMerge_annotated_3.pdf b/test/tests/data/duplicatesMerge_annotated_3.pdf
new file mode 100644
index 0000000000..4bba84e415
Binary files /dev/null and b/test/tests/data/duplicatesMerge_annotated_3.pdf differ
diff --git a/test/tests/itemTest.js b/test/tests/itemTest.js
index 985d70c331..7dfa4a84f8 100644
--- a/test/tests/itemTest.js
+++ b/test/tests/itemTest.js
@@ -1626,7 +1626,7 @@ describe("Zotero.Item", function () {
 			});
 
 			it("should recognize a strikeout annotation", async function () {
-				let attachment = await importFileAttachment('duplicatesMerge_annotated_2.pdf');
+				let attachment = await importFileAttachment('duplicatesMerge_annotated_3.pdf');
 				assert.isTrue(await attachment.hasEmbeddedAnnotations());
 			});
 
diff --git a/test/tests/itemsTest.js b/test/tests/itemsTest.js
index d0ad0e3179..86997289d8 100644
--- a/test/tests/itemsTest.js
+++ b/test/tests/itemsTest.js
@@ -934,6 +934,16 @@ describe("Zotero.Items", function () {
 			let item2 = item1.clone();
 			await item2.saveTx();
 			let attachment2 = await importFileAttachment('duplicatesMerge_annotated_2.pdf', { parentID: item2.id });
+			
+			// Import external annotations non-destructively
+			await Zotero.PDFWorker.import(attachment1.id, true);
+			await Zotero.PDFWorker.import(attachment2.id, true);
+
+			assert.lengthOf(attachment1.getAnnotations(), 1);
+			assert.lengthOf(attachment2.getAnnotations(), 1);
+			assert.isTrue(attachment1.getAnnotations()[0].annotationIsExternal);
+			assert.isTrue(attachment2.getAnnotations()[0].annotationIsExternal);
+			assert.isTrue(await attachment2.hasEmbeddedAnnotations()); // Unsupported attachment remains embedded
 
 			await Zotero.Items.merge(item1, [item2]);
 
@@ -943,6 +953,47 @@ describe("Zotero.Items", function () {
 			assert.isTrue(item2.deleted);
 			assert.isFalse(attachment2.deleted);
 			assert.equal(attachment2.parentItemID, item1.id);
+			
+			assert.lengthOf(attachment1.getAnnotations(), 1);
+			assert.lengthOf(attachment2.getAnnotations(), 1);
+			assert.isTrue(attachment1.getAnnotations()[0].annotationIsExternal);
+			assert.isTrue(attachment2.getAnnotations()[0].annotationIsExternal);
+		});
+		
+		it("should merge imported annotations into PDF with remaining unimported annotations", async function () {
+			let item1 = await createDataObject('item', { setTitle: true });
+			let attachment1 = await importFileAttachment('duplicatesMerge_annotated_1.pdf', { parentID: item1.id });
+
+			let item2 = item1.clone();
+			await item2.saveTx();
+			let attachment2 = await importFileAttachment('duplicatesMerge_annotated_2.pdf', { parentID: item2.id });
+
+			// Import external annotations non-destructively
+			await Zotero.PDFWorker.import(attachment1.id, true);
+			await Zotero.PDFWorker.import(attachment2.id, true);
+
+			assert.isTrue(attachment1.getAnnotations()[0].annotationIsExternal);
+			assert.isTrue(attachment2.getAnnotations()[0].annotationIsExternal);
+
+			// Import external annotations *destructively*
+			await Zotero.PDFWorker.import(attachment1.id, true, '', true);
+			await Zotero.PDFWorker.import(attachment2.id, true, '', true);
+
+			assert.lengthOf(attachment1.getAnnotations(), 1);
+			assert.lengthOf(attachment2.getAnnotations(), 1);
+			assert.isFalse(attachment1.getAnnotations()[0].annotationIsExternal);
+			assert.isFalse(attachment2.getAnnotations()[0].annotationIsExternal);
+			assert.isTrue(await attachment2.hasEmbeddedAnnotations()); // Unsupported annotation remains embedded
+
+			await Zotero.Items.merge(item1, [item2]);
+
+			assert.isTrue(attachment1.deleted);
+			assert.isFalse(attachment2.deleted);
+
+			assert.lengthOf(attachment1.getAnnotations(), 0);
+			assert.lengthOf(attachment2.getAnnotations(), 2);
+			assert.isFalse(attachment2.getAnnotations()[0].annotationIsExternal);
+			assert.isFalse(attachment2.getAnnotations()[1].annotationIsExternal);
 		});
 
 		it("should merge a non-master PDF without embedded annotations into a master PDF with embedded annotations", async function () {