diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index e36613fc2..0bbd27c45 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -341,11 +341,12 @@ bool CRecordInstance::Stop(bool remove_event)
 	/* Stop do close fd - if started */
 	record->Stop();
 
-	if(!autoshift)
-		CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
 
 	CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
 
+	if(!autoshift)
+		CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
+
 	if (autoshift && move_ts2rec)
 		CMoviePlayerGui::getInstance().moveTimeshift();
 	else if (autoshift && g_settings.timeshift_delete)
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 643508015..22b5b4cbc 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -220,12 +220,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());