diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 525868d946..e6ef93366b 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -937,7 +937,7 @@ void LoadInput(const std::string& filename)
 
 static void CheckInputEnd()
 {
-	if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes)
+	if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes || (CoreTiming::GetTicks() > g_totalTickCount && !IsRecordingInputFromSaveState()))
 	{
 		EndPlayInput(!g_bReadOnly);
 	}
diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
index bb2e767b27..05ee86cada 100644
--- a/Source/Core/Core/Movie.h
+++ b/Source/Core/Core/Movie.h
@@ -64,7 +64,7 @@ extern u64 g_currentByte, g_totalBytes;
 extern u64 g_currentFrame, g_totalFrames;
 extern u64 g_currentLagCount, g_totalLagCount;
 extern u64 g_currentInputCount, g_totalInputCount;
-extern u64 g_currentTickCount, g_totalTickCount, g_tickCountAtLastInput;
+extern u64 g_totalTickCount, g_tickCountAtLastInput;
 extern std::string g_discChange;
 
 extern u32 g_rerecords;