diff --git a/services/web/src/components/layout/layout.tsx b/services/web/src/components/layout/layout.tsx
index 04a92fb4..fa57240d 100644
--- a/services/web/src/components/layout/layout.tsx
+++ b/services/web/src/components/layout/layout.tsx
@@ -110,8 +110,8 @@ const AfterLogin: React.FC<AfterLoginProps> = ({
 
   if (
     !componentRole ||
-    (componentRole && componentRole === userRole) ||
-    userRole === roleTypes.ROLE_ADMIN
+    componentRole === userRole ||
+    (componentRole === roleTypes.ROLE_USER && userRole === roleTypes.ROLE_ADMIN)
   ) {
     return <Component />;
   }