diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index deed94a085..4df9808aa5 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -188,6 +188,8 @@ namespace OpenRA
 						else
 							if (orderManager.NetFrameNumber == 0)
 								orderManager.LastTickTime = Environment.TickCount;
+					
+						viewport.Tick();
 					}
 				}
 		}
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index e2ec53704c..e4c6dc4b50 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -183,7 +183,7 @@ namespace OpenRA
 
 			while (frameEndActions.Count != 0)
 				frameEndActions.Dequeue()(this);
-			Game.viewport.Tick();
+			
 		}
 
 		public IEnumerable<Actor> Actors { get { return actors; } }