diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 0cd8d0b35..4444de5bc 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 November 11, 2009
+- Fixed: The framerate was not capped before starting a game.
 - Removed the one embedded DeHackEd lump restriction.
 - Fixed: nofreeaim in P_SpawnPlayerMissile() was broken.
 - Fixed: MBF sky Y offsets were ignored. X offsets should also be applied to
diff --git a/src/d_main.cpp b/src/d_main.cpp
index a06340f68..9d1f90048 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -860,6 +860,9 @@ void D_DoomLoop ()
 {
 	int lasttic = 0;
 
+	// Clamp the timer to TICRATE until the playloop has been entered.
+	r_NoInterpolate = true;
+
 	for (;;)
 	{
 		try