diff --git a/source/network/NetTurnManager.cpp b/source/network/NetTurnManager.cpp
index 0ba54afbf5..47868df64b 100644
--- a/source/network/NetTurnManager.cpp
+++ b/source/network/NetTurnManager.cpp
@@ -549,6 +549,9 @@ void CNetReplayTurnManager::DoTurn(u32 turn)
 		m_Simulation2.GetScriptInterface().ParseJSON(pair.second, &command);
 		AddCommand(m_ClientId, pair.first, command, m_CurrentTurn + 1);
 	}
+
+	if (turn == m_FinalReplayTurn)
+		g_GUI->SendEventToAll("ReplayFinished");
 }
 
 CNetServerTurnManager::CNetServerTurnManager(CNetServerWorker& server) :
diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp
index 43bda1317e..0330a351a5 100644
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@@ -389,12 +389,10 @@ bool CGame::Update(const double deltaRealTime, bool doInterpolate)
 				PROFILE3("gui sim update");
 				g_GUI->SendEventToAll("SimulationUpdate");
 			}
-			if (m_IsReplay && m_TurnManager->GetCurrentTurn() == m_FinalReplayTurn - 1)
-				g_GUI->SendEventToAll("ReplayFinished");
 
 			GetView()->GetLOSTexture().MakeDirty();
 		}
-		
+
 		if (CRenderer::IsInitialised())
 			g_Renderer.GetTimeManager().Update(deltaSimTime);
 	}