diff --git a/module/project/control.php b/module/project/control.php
index 82c02e3ded..8809a6e7af 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -86,7 +86,7 @@ class project extends control
         $this->loadModel('product');
 
         /* Get projects and products info. */
-        $projectID     = $this->project->saveState($projectID, array_keys($this->projects));
+        $projectID     = $this->project->saveState($projectID, $this->projects);
         $project       = $this->project->getById($projectID);
         $products      = $this->project->getProducts($project->id);
         $childProjects = $this->project->getChildProjects($project->id);
diff --git a/module/project/model.php b/module/project/model.php
index 7cde5a6536..23d4c0b2fd 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -196,8 +196,9 @@ class projectModel extends model
     public function saveState($projectID, $projects)
     {
         if($projectID > 0) $this->session->set('project', (int)$projectID);
-        if($projectID == 0 and $this->cookie->lastProject)    $this->session->set('project', (int)$this->cookie->lastProject);
-        if($projectID == 0 and $this->session->project == '') $this->session->set('project', $projects[0]);
+        if($projectID == 0 and $this->cookie->lastProject) $this->session->set('project', (int)$this->cookie->lastProject);
+        if($projectID == 0 and $this->session->project == '') $this->session->set('project', key($projects));
+        if(!isset($projects[$this->session->project])) $this->session->set('project', key($projects));
         return $this->session->project;
     }