diff --git a/packages/ui/src/routes/RequireAuth.jsx b/packages/ui/src/routes/RequireAuth.jsx
index db8b179e7..72c15f019 100644
--- a/packages/ui/src/routes/RequireAuth.jsx
+++ b/packages/ui/src/routes/RequireAuth.jsx
@@ -71,10 +71,12 @@ export const RequireAuth = ({ permission, display, children }) => {
     const [isBillingLoading, setIsBillingLoading] = useState(false)
 
     useEffect(() => {
-        if (currentUser && currentUser.isOrganizationAdmin === false) {
-            handleSwitchWorkspace(currentUser)
-        } else if (organization && organization.status === 'past_due') {
-            setShowOrgPastDueDialog(true)
+        if (organization && organization.status === 'past_due') {
+            if (currentUser && currentUser.isOrganizationAdmin === false) {
+                handleSwitchWorkspace(currentUser)
+            } else {
+                setShowOrgPastDueDialog(true)
+            }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [organization, currentUser])