diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp
index 3cc0ea8b7..d4fa20134 100644
--- a/plugins/feature/afc/afc.cpp
+++ b/plugins/feature/afc/afc.cpp
@@ -732,7 +732,7 @@ void AFC::removeTrackerFeatureReference()
             MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
 
             if (messageQueue) {
-                disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*)));
+                disconnect(messageQueue, &MessageQueue::messageEnqueued, this, nullptr);  // Have to use nullptr, as slot is a lambda.
             }
         }
 
@@ -751,7 +751,7 @@ void AFC::removeTrackedFeatureReferences()
             MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
 
             if (messageQueue) {
-                disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*)));
+                disconnect(messageQueue, &MessageQueue::messageEnqueued, this, nullptr);  // Have to use nullptr, as slot is a lambda.
             }
         }
 
diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp
index 11bdc0564..028838bbc 100644
--- a/plugins/feature/demodanalyzer/demodanalyzer.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp
@@ -380,7 +380,7 @@ void DemodAnalyzer::setChannel(ChannelAPI *selectedChannel)
             MessageQueue *messageQueue = qobject_cast<MessageQueue*>(messagePipe->m_element);
 
             if (messageQueue) {
-                disconnect(messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleChannelMessageQueue(MessageQueue*)));
+                disconnect(messageQueue, &MessageQueue::messageEnqueued, this, nullptr);  // Have to use nullptr, as slot is a lambda.
             }
         }
     }