diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
index fe030f8f1..52787f9df 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java
@@ -89,6 +89,8 @@ public class BaseAccountAuthenticator {
         return Optional.empty();
       }
 
+      hasStoryCapability = account.map(Account::isStoriesSupported).orElse(false);
+
       Optional<Device> device = account.get().getDevice(deviceId);
 
       if (device.isEmpty()) {
@@ -108,11 +110,6 @@ public class BaseAccountAuthenticator {
         }
       }
 
-      Device.DeviceCapabilities capabilities = device.get().getCapabilities();
-      if (capabilities != null) {
-        hasStoryCapability = capabilities.isStories();
-      }
-
       AuthenticationCredentials deviceAuthenticationCredentials = device.get().getAuthenticationCredentials();
       if (deviceAuthenticationCredentials.verify(basicCredentials.getPassword())) {
         succeeded = true;