diff --git a/packages/backend-core/src/cache/user.js b/packages/backend-core/src/cache/user.js
index e409532a5c..825b66b99c 100644
--- a/packages/backend-core/src/cache/user.js
+++ b/packages/backend-core/src/cache/user.js
@@ -17,7 +17,9 @@ const populateFromDB = async (userId, tenantId) => {
     // TODO: Break this out into it's own cache
     if (account) {
       const license = await accounts.getLicense(user.tenantId)
-      user.license = license
+      if (license) {
+        user.license = license
+      }
       user.account = account
       user.accountPortalAccess = true
     }
diff --git a/packages/backend-core/src/cloud/accounts.js b/packages/backend-core/src/cloud/accounts.js
index 87bb4dcf52..6f8fd9e837 100644
--- a/packages/backend-core/src/cloud/accounts.js
+++ b/packages/backend-core/src/cloud/accounts.js
@@ -31,6 +31,11 @@ exports.getLicense = async tenantId => {
     },
   })
 
+  if (response.status === 404) {
+    // no license for the tenant
+    return
+  }
+
   if (response.status !== 200) {
     const text = await response.text()
     console.error("Error getting license: ", text)