diff --git a/client/pages/Staff.tsx b/client/pages/Staff.tsx
index bf366a4c..cf8e9a8c 100644
--- a/client/pages/Staff.tsx
+++ b/client/pages/Staff.tsx
@@ -48,7 +48,8 @@ export default function Staff() {
     return () => clearTimeout(timer);
   }, []);
 
-  if (isLoading) {
+  // Show loading screen while checking authentication
+  if (isLoading || loading) {
     return (
       <LoadingScreen
         message="Securing Staff Portal..."