diff --git a/packages/admin-ui/src/Main.jsx b/packages/admin-ui/src/Main.jsx
index e162b96..4600cee 100644
--- a/packages/admin-ui/src/Main.jsx
+++ b/packages/admin-ui/src/Main.jsx
@@ -29,11 +29,22 @@ const GET_USER_DATA = gql`
 
 const Main = () => {
   const [location, navigate] = useLocation()
-  const { wizardTested, userData, setUserData } = useContext(AppContext)
+  const { wizardTested, userData, setUserData} = useContext(AppContext)
   const [loading, setLoading] = useState(true)
   const [restrictionLevel, setRestrictionLevel] = useState(null)
 
+  // Skip auth queries on unauthenticated pages (like /register and /login)
+  const isPublicPage = location.startsWith('/register') || location.startsWith('/login')
+
+  // Set loading to false immediately for public pages
+  React.useEffect(() => {
+    if (isPublicPage) {
+      setLoading(false)
+    }
+  }, [isPublicPage])
+
   useQuery(GET_USER_DATA, {
+    skip: isPublicPage,
     onCompleted: userResponse => {
       if (!userData && userResponse?.userData) {
         setUserData(userResponse.userData)
@@ -43,6 +54,10 @@ const Main = () => {
       }
       setLoading(false)
     },
+    onError: () => {
+      // If query fails, just mark as not loading
+      setLoading(false)
+    },
   })
 
   const sidebar = hasSidebar(location)