diff --git a/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachmentPointer.m b/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachmentPointer.m
index e27bccab2..6a675fa64 100644
--- a/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachmentPointer.m	
+++ b/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachmentPointer.m	
@@ -169,8 +169,10 @@ NS_ASSUME_NONNULL_BEGIN
     // Legacy instances of TSAttachmentPointer apparently used the serverId as their
     // uniqueId.
     if (attachmentSchemaVersion < 2 && self.serverId == 0) {
-        // For legacy instances, try to parse the serverId from the uniqueId.
-        self.serverId = (UInt64)[self.uniqueId integerValue];
+        if ([self isDecimalNumberText:self.uniqueId]) {
+            // For legacy instances, try to parse the serverId from the uniqueId.
+            self.serverId = (UInt64)[self.uniqueId integerValue];
+        }
     }
 }