diff --git a/js/models/conversations.js b/js/models/conversations.js
index 150787057..1f098d500 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -224,7 +224,7 @@
       return !!(this.id && this.id.match(/^rss:/));
     },
     isBlocked() {
-      if (this.isMe()) {
+      if (!this.id || this.isMe()) {
         return false;
       }
 
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index a27dca199..2ef992b2b 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -97,6 +97,11 @@ function unpad(paddedData: ArrayBuffer): ArrayBuffer {
 }
 
 export async function isBlocked(number: string) {
+  const ourDevice = await MultiDeviceProtocol.isOurDevice(number);
+  if (ourDevice) {
+    return false;
+  }
+
   const primary = await MultiDeviceProtocol.getPrimaryDevice(number);
   return (
     BlockedNumberController.isBlocked(primary) ||