diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index e18b96fb5..db409bb60 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -6395,7 +6395,7 @@ void OBSBasic::StreamingStop(int code, QString last_error)
 	}
 }
 
-void OBSBasic::AutoRemux()
+void OBSBasic::AutoRemux(QString input)
 {
 	bool autoRemux = config_get_bool(Config(), "Video", "AutoRemux");
 
@@ -6409,7 +6409,6 @@ void OBSBasic::AutoRemux()
 	if (ffmpegOutput)
 		return;
 
-	QString input = outputHandler->lastRecordingPath.c_str();
 	if (input.isEmpty())
 		return;
 
@@ -6571,7 +6570,7 @@ void OBSBasic::RecordingStop(int code, QString last_error)
 	if (diskFullTimer->isActive())
 		diskFullTimer->stop();
 
-	AutoRemux();
+	AutoRemux(outputHandler->lastRecordingPath.c_str());
 
 	OnDeactivate();
 	UpdatePause(false);
@@ -6721,6 +6720,8 @@ void OBSBasic::ReplayBufferSaved()
 
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_SAVED);
+
+	AutoRemux(path);
 }
 
 void OBSBasic::ReplayBufferStop(int code)
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index 28076da4d..03c7c2bca 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -745,7 +745,7 @@ private:
 
 	static void HotkeyTriggered(void *data, obs_hotkey_id id, bool pressed);
 
-	void AutoRemux();
+	void AutoRemux(QString input);
 
 	void UpdatePause(bool activate = true);
 	void UpdateReplayBuffer(bool activate = true);