diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index e4670fac8..2370e834a 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -336,13 +336,14 @@ bool CRecordInstance::Stop(bool remove_event)
 	printf("%s: file %s.ts\n", __FUNCTION__, filename);
 	SaveXml();
 	/* Stop do close fd - if started */
+	/* Stop do close fd - if started */
 	record->Stop();
 
+	CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
+
 	if(!autoshift)
 		CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
 
-	CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
-
 	if (autoshift && g_settings.timeshift_delete)
 		CMoviePlayerGui::getInstance().deleteTimeshift();
 
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 98d467440..ed8343371 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -217,12 +217,13 @@ void CStreamInstance::run()
 			Send(r);
 	}
 
+	CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
+
 #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	if(frontend)
 		CFEManager::getInstance()->unlockFrontend(frontend);
 	//CZapit::getInstance()->SetRecordMode(false);
 #endif
-	CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
 
 	printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());