diff --git a/libs/libmythtv/recorderbase.cpp b/libs/libmythtv/recorderbase.cpp
index 3323042..34e7e5d 100644
--- a/libs/libmythtv/recorderbase.cpp
+++ b/libs/libmythtv/recorderbase.cpp
@@ -58,6 +58,9 @@ void RecorderBase::SetRecording(const ProgramInfo *pginfo)
     else
         VERBOSE(VB_RECORD, LOC + "SetRecording(0x0)");
 
+    if (curRecording)
+        FinishRecording();
+
     ProgramInfo *oldrec = curRecording;
     if (pginfo)
         curRecording = new ProgramInfo(*pginfo);