diff --git a/inc/spot.php b/inc/spot.php
index 7c86089..b1f7ab6 100755
--- a/inc/spot.php
+++ b/inc/spot.php
@@ -147,6 +147,13 @@ class Spot extends Main
 	
 	public function setProjectId($iProjectId=0) {
 		$this->oProject->setProjectId($iProjectId);
+		
+		//Update all feeds belonging to the project
+		$asFeeds = $this->oProject->getFeedIds();
+		foreach($asFeeds as $iFeedId) {
+			$oFeed = new Feed($this->oDb, $iFeedId);
+			$oFeed->checkUpdateFeed($this->oProject->getMode());
+		}
 	}
 	
 	public function getMarkers()
@@ -186,8 +193,6 @@ class Spot extends Main
 		$asFeeds = $this->oProject->getFeedIds();
 		foreach($asFeeds as $iFeedId) {
 			$oFeed = new Feed($this->oDb, $iFeedId);
-			$oFeed->checkUpdateFeed($this->oProject->getMode());
-		
 			$asMessages = $oFeed->getMessages($this->oProject->getActivePeriod());
 			foreach($asMessages as $iIndex=>&$asMessage)
 			{