diff --git a/include/hyperion/Hyperion.h b/include/hyperion/Hyperion.h
index 592202a4..d86aeeea 100644
--- a/include/hyperion/Hyperion.h
+++ b/include/hyperion/Hyperion.h
@@ -439,13 +439,15 @@ signals:
 	///
 	void started();
 
-private slots:
+public slots:
 	///
 	/// Updates the priority muxer with the current time and (re)writes the led color with applied
 	/// transforms.
 	///
 	void update();
 
+private slots:
+
 	///
 	///	@brief Apply ComponentRegister emits for COMP_ALL. Enables/Disables core timers
 	///	@param comp   The component
diff --git a/libsrc/hyperion/CaptureCont.cpp b/libsrc/hyperion/CaptureCont.cpp
index 89eae882..28941936 100644
--- a/libsrc/hyperion/CaptureCont.cpp
+++ b/libsrc/hyperion/CaptureCont.cpp
@@ -81,6 +81,8 @@ void CaptureCont::setSystemCaptureEnable(const bool& enable)
 		{
 			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, 0, 0);
 			_hyperion->clear(_systemCaptPrio);
+			_systemInactiveTimer->stop();
+			_systemCaptName = "";
 		}
 		_systemCaptEnabled = enable;
 		_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_GRABBER, enable);
@@ -103,6 +105,7 @@ void CaptureCont::setV4LCaptureEnable(const bool& enable)
 			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, 0, 0);
 			_hyperion->clear(_v4lCaptPrio);
 			_v4lInactiveTimer->stop();
+			_v4lCaptName = "";
 		}
 		_v4lCaptEnabled = enable;
 		_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_V4L, enable);