diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.py
index 78a9b9547..55471e674 100644
--- a/apiserver/plane/app/views/project/base.py
+++ b/apiserver/plane/app/views/project/base.py
@@ -240,6 +240,12 @@ class ProjectViewSet(BaseViewSet):
             )
         ).first()
 
+        if project is None:
+            return Response(
+                {"error": "Project does not exist"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
         serializer = ProjectListSerializer(project)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
diff --git a/web/core/layouts/auth-layout/project-wrapper.tsx b/web/core/layouts/auth-layout/project-wrapper.tsx
index 593be9046..606cc76b5 100644
--- a/web/core/layouts/auth-layout/project-wrapper.tsx
+++ b/web/core/layouts/auth-layout/project-wrapper.tsx
@@ -116,7 +116,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
   if (projectExists && projectId && hasPermissionToProject[projectId.toString()] === false) return <JoinProject />;
 
   // check if the project info is not found.
-  if (!projectExists && projectId && hasPermissionToProject[projectId.toString()] === false)
+  if (!projectExists && projectId && !!hasPermissionToProject[projectId.toString()] === false)
     return (
       <div className="container grid h-screen place-items-center bg-custom-background-100">
         <EmptyState