diff --git a/plugins/channelrx/freqscanner/freqscanner.cpp b/plugins/channelrx/freqscanner/freqscanner.cpp
index 42c00a2b6..8c85f5587 100644
--- a/plugins/channelrx/freqscanner/freqscanner.cpp
+++ b/plugins/channelrx/freqscanner/freqscanner.cpp
@@ -243,16 +243,12 @@ bool FreqScanner::handleMessage(const Message& cmd)
     }
     else if (MsgStartScan::match(cmd))
     {
-        qInfo() << "FreqScanner::handleMessage: StartScan";
-
         startScan();
 
         return true;
     }
     else if (MsgStopScan::match(cmd))
     {
-        qInfo() << "FreqScanner::handleMessage: StopScan";
-
         stopScan();
 
         return true;
@@ -295,12 +291,10 @@ void FreqScanner::initScan()
 
     if (m_centerFrequency != m_stepStartFrequency)
     {
-        qInfo() << "******************** Setting frequency to " << m_stepStartFrequency;
         if (!ChannelWebAPIUtils::setCenterFrequency(getDeviceSetIndex(), m_stepStartFrequency)) {
-            qWarning() << "Scanner failed to set frequency" << m_stepStartFrequency;
+            qWarning() << "Freq Scanner failed to set frequency" << m_stepStartFrequency;
         }
         m_minFFTStartTime = QDateTime::currentDateTime().addMSecs(m_settings.m_tuneTime);
-        qInfo() << "m_minFFTStartTime" << m_minFFTStartTime.toString("ss.z");
     }
 
     m_scanResults.clear();
@@ -343,7 +337,6 @@ void FreqScanner::processScanResults(const QDateTime& fftStartTime, const QList<
                 m_stepStartFrequency = frequencies.front() + m_scannerSampleRate / 2 - m_settings.m_channelBandwidth + m_settings.m_channelBandwidth / 2;
                 m_stepStopFrequency = frequencies.back();
 
-                qInfo() << "START_SCAN: Scanning from " << frequencies.front() << "to" << frequencies.back();
                 initScan();
             }
         }
@@ -476,7 +469,7 @@ void FreqScanner::processScanResults(const QDateTime& fftStartTime, const QList<
                                 }
                             }
 
-                            //qInfo() << "Tuning to active freq:" << frequency << "m_centerFrequency" << m_centerFrequency << "nextCenterFrequency" << nextCenterFrequency << "offset: " << offset << "deviceset: R" << m_scanDeviceSetIndex << ":" << m_scanChannelIndex;
+                            //qDebug() << "Tuning to active freq:" << frequency << "m_centerFrequency" << m_centerFrequency << "nextCenterFrequency" << nextCenterFrequency << "offset: " << offset << "deviceset: R" << m_scanDeviceSetIndex << ":" << m_scanChannelIndex;
 
                             ChannelWebAPIUtils::setFrequencyOffset(m_scanDeviceSetIndex, m_scanChannelIndex, offset);
 
@@ -513,7 +506,7 @@ void FreqScanner::processScanResults(const QDateTime& fftStartTime, const QList<
             {
                 // For RTL SDR, setCenterFrequency takes ~50ms, which means tuneTime can be 0
                 if (!ChannelWebAPIUtils::setCenterFrequency(getDeviceSetIndex(), nextCenterFrequency)) {
-                    qWarning() << "Scanner failed to set frequency" << nextCenterFrequency;
+                    qWarning() << "Freq Scanner failed to set frequency" << nextCenterFrequency;
                 }
                 m_minFFTStartTime = QDateTime::currentDateTime().addMSecs(m_settings.m_tuneTime);
             }
diff --git a/plugins/channelrx/freqscanner/freqscanner.h b/plugins/channelrx/freqscanner/freqscanner.h
index 85a956a79..b4ab200f1 100644
--- a/plugins/channelrx/freqscanner/freqscanner.h
+++ b/plugins/channelrx/freqscanner/freqscanner.h
@@ -364,7 +364,6 @@ public:
         fftSize = pow(2.0, floor(log2(basebandSampleRate / binBW)));
         fftSize = std::min(maxFFTSize, fftSize);
         scannerSampleRate = binBW * fftSize;
-        qInfo() << "binsPerChannel:" << binsPerChannel << "fftSize:" << fftSize << "scannerSampleRate:" << scannerSampleRate;
     }
 
     static const char * const m_channelIdURI;
diff --git a/plugins/channelrx/freqscanner/freqscannergui.cpp b/plugins/channelrx/freqscanner/freqscannergui.cpp
index 71381c03c..81146f8cb 100644
--- a/plugins/channelrx/freqscanner/freqscannergui.cpp
+++ b/plugins/channelrx/freqscanner/freqscannergui.cpp
@@ -209,8 +209,8 @@ void FreqScannerGUI::updateChannelsList(const QList<FreqScannerSettings::Availab
 
     for (const auto& channel : channels)
     {
-        // Add channels in this device set, other than ourself
-        if ((channel.m_deviceSetIndex == getDeviceSetIndex()) && (channel.m_channelIndex != getIndex()))
+        // Add channels in this device set, other than ourself (Don't use ChannelGUI::getDeviceSetIndex()/getIndex() as not valid when this is first called)
+        if ((channel.m_deviceSetIndex == m_freqScanner->getDeviceSetIndex()) && (channel.m_channelIndex != m_freqScanner->getIndexInDeviceSet()))
         {
             QString name = QString("R%1:%2").arg(channel.m_deviceSetIndex).arg(channel.m_channelIndex);
             ui->channels->addItem(name);