diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index 01b124339..1dd7130e8 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -649,6 +649,10 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
 }
 
 - (AnyPromise *)updateAccountAttributesIfNecessary {
+    if (!self.isRegistered) {
+        return [AnyPromise promiseWithValue:@(1)];
+    }
+
     NSDate *_Nullable updateRequestDate =
         [self.dbConnection objectForKey:TSAccountManager_NeedsAccountAttributesUpdateKey
                            inCollection:TSAccountManager_UserAccountCollection];