diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
index 79a22cfe017..60a5ecb461d 100644
--- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
@@ -165,9 +165,24 @@ export class DefaultServerNotificationsService implements ServerNotificationsSer
   }
 
   private hasAccessToken$(userId: UserId) {
-    return this.authService.authStatusFor$(userId).pipe(
-      map((authStatus) => authStatus === AuthenticationStatus.Unlocked),
-      distinctUntilChanged(),
+    return this.configService.getFeatureFlag$(FeatureFlag.PushNotificationsWhenLocked).pipe(
+      switchMap((featureFlagEnabled) => {
+        if (featureFlagEnabled) {
+          return this.authService.authStatusFor$(userId).pipe(
+            map(
+              (authStatus) =>
+                authStatus === AuthenticationStatus.Locked ||
+                authStatus === AuthenticationStatus.Unlocked,
+            ),
+            distinctUntilChanged(),
+          );
+        } else {
+          return this.authService.authStatusFor$(userId).pipe(
+            map((authStatus) => authStatus === AuthenticationStatus.Unlocked),
+            distinctUntilChanged(),
+          );
+        }
+      }),
     );
   }