diff --git a/OpenRA.Game/Traits/World/ScreenShaker.cs b/OpenRA.Game/Traits/World/ScreenShaker.cs
index c8268ff202..d9f200ed99 100644
--- a/OpenRA.Game/Traits/World/ScreenShaker.cs
+++ b/OpenRA.Game/Traits/World/ScreenShaker.cs
@@ -22,9 +22,11 @@ namespace OpenRA.Traits
         List<ShakeEffect> shakeEffects = new List<ShakeEffect>();
 		
 		public void Tick (Actor self)
-		{
-			Game.viewport.Scroll(GetScrollOffset(), true);
-			shakeEffects.RemoveAll(t => t.ExpiryTime == ticks);
+		{
+			if(shakeEffects.Any()){
+				Game.viewport.Scroll(GetScrollOffset(), true);
+				shakeEffects.RemoveAll(t => t.ExpiryTime == ticks);
+			}
 			ticks++;
 		}