diff --git a/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
index 67e9be615..1595d74e9 100644
--- a/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
@@ -317,8 +317,11 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
 							.getMessage(txn, messageEntry.getKey());
 					MessageStatus status = db.getMessageStatus(txn, contactId,
 							messageEntry.getKey());
-					headers.add(
-							createMessageHeader(message, meta, status, WIPE));
+					if (meta.getBoolean(MSG_KEY_LOCAL)) {
+						headers.add(
+								createMessageHeader(message, meta, status,
+										WIPE));
+					}
 				}
 			}
 			return headers;