diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp
index 841cbb67c..0226cbe7d 100644
--- a/plugins/samplesink/limesdroutput/limesdroutput.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp
@@ -546,7 +546,7 @@ bool LimeSDROutput::handleMessage(const Message& message)
     {
         DeviceLimeSDRShared::MsgReportBuddyChange& report = (DeviceLimeSDRShared::MsgReportBuddyChange&) message;
 
-        if (report.getRxElseTx())
+        if (report.getRxElseTx() && m_running)
         {
             double host_Hz;
             double rf_Hz;
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index d9299751d..1abfa88dc 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -550,7 +550,7 @@ bool LimeSDRInput::handleMessage(const Message& message)
             m_settings.m_log2HardDecim   = report.getLog2HardDecimInterp();
             m_settings.m_centerFrequency = report.getCenterFrequency();
         }
-        else
+        else if (m_running)
         {
             double host_Hz;
             double rf_Hz;