diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 4f56b9cc42..93f081562d 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -501,6 +501,10 @@ namespace OpenRA
 					Tick(orderManager);
 			}
 
+			// Ensure that the active replay is properly saved
+			if (orderManager != null)
+				orderManager.Dispose();
+
 			OnQuit();
 		}