diff --git a/src/gl/utility/gl_clock.cpp b/src/gl/utility/gl_clock.cpp
index 5cd1daa219f..a67df023453 100644
--- a/src/gl/utility/gl_clock.cpp
+++ b/src/gl/utility/gl_clock.cpp
@@ -226,7 +226,7 @@ void CheckBench()
 	{
 		// if we started the FPS counter ourselves or ran from the console 
 		// we need to wait for it to stabilize before using it.
-		if (waitstart > 0 && I_MSTime() < waitstart + 5000) return;
+		if (waitstart > 0 && I_FPSTime() - waitstart < 5000) return;
 
 		FString compose;
 
@@ -257,12 +257,12 @@ CCMD(bench)
 	if (vid_fps == 0) 
 	{
 		vid_fps = 1;
-		waitstart = I_MSTime();
+		waitstart = I_FPSTime();
 		switchfps = true;
 	}
 	else
 	{
-		if (ConsoleState == c_up) waitstart = I_MSTime();
+		if (ConsoleState == c_up) waitstart = I_FPSTime();
 		switchfps = false;
 	}
 	C_HideConsole ();
diff --git a/src/i_time.cpp b/src/i_time.cpp
index 908dbdd59fc..6fe65ef3cb8 100644
--- a/src/i_time.cpp
+++ b/src/i_time.cpp
@@ -142,10 +142,7 @@ uint64_t I_NSTime()
 
 uint64_t I_FPSTimeNS()
 {
-	if (FreezeTime == 0)
-		return CurrentFrameStartTime;
-	else
-		return GetClockTimeNS();
+	return GetClockTimeNS();
 }
 
 unsigned int I_MSTime()