diff --git a/src/core/server/services/migrate/migrations/1573858750460_sso_token_refactor.ts b/src/core/server/services/migrate/migrations/1573858750460_sso_token_refactor.ts
index af04075fa..7dbbde912 100644
--- a/src/core/server/services/migrate/migrations/1573858750460_sso_token_refactor.ts
+++ b/src/core/server/services/migrate/migrations/1573858750460_sso_token_refactor.ts
@@ -32,7 +32,15 @@ function isOldSSOKey(key: SSOKey | OldSSOKey): key is OldSSOKey {
     return false;
   }
 
-  return true;
+  if ((key as OldSSOKey).deprecateAt) {
+    return true;
+  }
+
+  if ((key as OldSSOKey).deletedAt) {
+    return true;
+  }
+
+  return false;
 }
 
 interface OldTenant {
diff --git a/src/core/server/services/tenant/cache/index.ts b/src/core/server/services/tenant/cache/index.ts
index 4a1bb1122..0ce73e23e 100644
--- a/src/core/server/services/tenant/cache/index.ts
+++ b/src/core/server/services/tenant/cache/index.ts
@@ -261,7 +261,7 @@ export default class TenantCache {
   /**
    *  onMessage is fired every time the client gets a subscription event.
    */
-  private async onMessage(channel: string, data: string): Promise<void> {
+  private onMessage = async (channel: string, data: string): Promise<void> => {
     // Only do things when the message is for tenant.
     if (channel !== TENANT_CACHE_CHANNEL) {
       return;
@@ -299,7 +299,7 @@ export default class TenantCache {
         "an error occurred while trying to handle a message"
       );
     }
-  }
+  };
 
   public async retrieveByID(id: string): Promise<Readonly<Tenant> | null> {
     return this.tenantsByID.load(id);