diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 10564b550..67eb5ca3f 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -3978,7 +3978,10 @@ void CClient::DemoRecorder_Stop(int Recorder, bool RemoveFile)
 	{
 		const char *pFilename = m_aDemoRecorder[Recorder].GetCurrentFilename();
 		if(pFilename[0] != '\0')
+		{
 			Storage()->RemoveFile(pFilename, IStorage::TYPE_SAVE);
+			m_aDemoRecorder[Recorder].ClearCurrentFilename();
+		}
 	}
 }
 
diff --git a/src/engine/shared/demo.h b/src/engine/shared/demo.h
index 589f6ec38..b9706d585 100644
--- a/src/engine/shared/demo.h
+++ b/src/engine/shared/demo.h
@@ -49,6 +49,7 @@ public:
 
 	bool IsRecording() const override { return m_File != nullptr; }
 	char *GetCurrentFilename() override { return m_aCurrentFilename; }
+	void ClearCurrentFilename() { m_aCurrentFilename[0] = '\0'; }
 
 	int Length() const override { return (m_LastTickMarker - m_FirstTick) / SERVER_TICK_SPEED; }
 };