diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index cd4838c9..a66be189 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -115,9 +115,6 @@ const Header = () => {
         if (projectExist) {
           cacheData("hasReceived", false);
         }
-        if(!selectedProject){
-          dispatch(setProjectId(projectNames[0]?.id));
-        }
       }
     },
     [fetchData,projectNames,selectedProject]
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 6399be6e..21c8e396 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -175,6 +175,7 @@ export const useProjectName = () => {
   const [loading, setLoading] = useState(true);
   const [projectNames, setProjectName] = useState([]);
   const [Error, setError] = useState();
+  const dispatch = useDispatch();
 
   const fetchData = async () => {
     try {
@@ -182,6 +183,9 @@ export const useProjectName = () => {
       setProjectName(response.data);
       cacheData("basicProjectNameList", response.data);
       setLoading(false);
+      if(response.data.length === 1){
+        dispatch(setProjectId(response.data[0]?.id));
+      }
     } catch (err) {
       setError("Failed to fetch data.");
       setLoading(false);