diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp
index e7dbf3655..8c4ea59ca 100644
--- a/plugins/channeltx/modam/ammod.cpp
+++ b/plugins/channeltx/modam/ammod.cpp
@@ -274,15 +274,18 @@ bool AMMod::handleMessage(const Message& cmd)
 		m_config.m_outputSampleRate = notif.getSampleRate();
 		m_config.m_inputFrequencyOffset = notif.getFrequencyOffset();
 
-		m_settings.m_outputSampleRate = notif.getSampleRate();
-		m_settings.m_inputFrequencyOffset = notif.getFrequencyOffset();
+		AMModSettings settings = m_settings;
 
-		apply();
+		settings.m_basebandSampleRate = notif.getBasebandSampleRate();
+		settings.m_outputSampleRate = notif.getSampleRate();
+		settings.m_inputFrequencyOffset = notif.getFrequencyOffset();
+
+		applySettings(settings);
 
 		qDebug() << "AMMod::handleMessage: MsgChannelizerNotification:"
-				<< " m_basebandSampleRate: " << m_config.m_basebandSampleRate
-                << " m_outputSampleRate: " << m_config.m_outputSampleRate
-				<< " m_inputFrequencyOffset: " << m_config.m_inputFrequencyOffset;
+				<< " m_basebandSampleRate: " << settings.m_basebandSampleRate
+                << " m_outputSampleRate: " << settings.m_outputSampleRate
+				<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
 
 		return true;
 	}
@@ -293,12 +296,16 @@ bool AMMod::handleMessage(const Message& cmd)
         AMModSettings settings = cfg.getSettings();
 
         // These settings are set with DownChannelizer::MsgChannelizerNotification
+        settings.m_basebandSampleRate = m_settings.m_basebandSampleRate;
         settings.m_outputSampleRate = m_settings.m_outputSampleRate;
         settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset;
 
         applySettings(settings, cfg.getForce());
 
         qDebug() << "AMMod::handleMessage: MsgConfigureAMMod:"
+                << " m_basebandSampleRate: " << settings.m_basebandSampleRate
+                << " m_outputSampleRate: " << settings.m_outputSampleRate
+                << " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset
                 << " m_rfBandwidth: " << settings.m_rfBandwidth
                 << " m_modFactor: " << settings.m_modFactor
                 << " m_toneFrequency: " << settings.m_toneFrequency
diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp
index 988415a26..9615a9d45 100644
--- a/plugins/channeltx/modam/ammodgui.cpp
+++ b/plugins/channeltx/modam/ammodgui.cpp
@@ -409,16 +409,16 @@ void AMModGUI::applySettings(bool force __attribute((unused)))
 
 		ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
 
-//        AMMod::MsgConfigureAMMod* message = AMMod::MsgConfigureAMMod::create( m_settings, force);
-//        m_amMod->getInputMessageQueue()->push(message);
+        AMMod::MsgConfigureAMMod* message = AMMod::MsgConfigureAMMod::create( m_settings, force);
+        m_amMod->getInputMessageQueue()->push(message);
 
-		m_amMod->configure(m_amMod->getInputMessageQueue(),
-			m_settings.m_rfBandwidth,
-			m_settings.m_modFactor,
-			m_settings.m_toneFrequency,
-			m_settings.m_volumeFactor,
-			m_settings.m_channelMute,
-			m_settings.m_playLoop);
+//		m_amMod->configure(m_amMod->getInputMessageQueue(),
+//			m_settings.m_rfBandwidth,
+//			m_settings.m_modFactor,
+//			m_settings.m_toneFrequency,
+//			m_settings.m_volumeFactor,
+//			m_settings.m_channelMute,
+//			m_settings.m_playLoop);
 	}
 }