diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp
index 4361df909..eb2da34bd 100644
--- a/plugins/channeltx/modam/ammod.cpp
+++ b/plugins/channeltx/modam/ammod.cpp
@@ -71,7 +71,7 @@ AMMod::AMMod() :
 	m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
 	m_cwKeyer.setWPM(13);
 	m_cwKeyer.setMode(CWKeyer::CWNone);
-	m_cwSmoother.setNbFadeSamples(96); // 2 ms @ 48 kHz
+	m_cwSmoother.setNbFadeSamples(192); // 4 ms @ 48 kHz
 }
 
 AMMod::~AMMod()
@@ -359,7 +359,7 @@ void AMMod::apply()
 	if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
 	{
 	    m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
-	    m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms
+	    m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
 	}
 
 	m_running.m_outputSampleRate = m_config.m_outputSampleRate;
diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp
index dbfa7ebe8..589e3dbd4 100644
--- a/plugins/channeltx/modnfm/nfmmod.cpp
+++ b/plugins/channeltx/modnfm/nfmmod.cpp
@@ -73,7 +73,7 @@ NFMMod::NFMMod() :
     m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
     m_cwKeyer.setWPM(13);
     m_cwKeyer.setMode(CWKeyer::CWNone);
-    m_cwSmoother.setNbFadeSamples(96); // 2 ms @ 48 kHz
+    m_cwSmoother.setNbFadeSamples(192); // 2 ms @ 48 kHz
 }
 
 NFMMod::~NFMMod()
@@ -377,7 +377,7 @@ void NFMMod::apply()
     if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
     {
         m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
-        m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms
+        m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
     }
 
 	m_running.m_outputSampleRate = m_config.m_outputSampleRate;
diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp
index 2f7dc15b0..98ff21b6c 100644
--- a/plugins/channeltx/modssb/ssbmod.cpp
+++ b/plugins/channeltx/modssb/ssbmod.cpp
@@ -93,7 +93,7 @@ SSBMod::SSBMod(BasebandSampleSink* sampleSink) :
 	m_cwKeyer.setWPM(13);
 	m_cwKeyer.setMode(CWKeyer::CWNone);
 
-	m_cwSmoother.setNbFadeSamples(96); // 2 ms at 48 kHz
+	m_cwSmoother.setNbFadeSamples(192); // 4 ms at 48 kHz
     apply();
 }
 
@@ -674,7 +674,7 @@ void SSBMod::apply()
 	{
         m_settingsMutex.lock();
 	    m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
-	    m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms
+	    m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
         m_settingsMutex.unlock();
 	}
 
diff --git a/sdrbase/dsp/cwkeyer.cpp b/sdrbase/dsp/cwkeyer.cpp
index 76b2cce0f..46729bd68 100644
--- a/sdrbase/dsp/cwkeyer.cpp
+++ b/sdrbase/dsp/cwkeyer.cpp
@@ -459,7 +459,7 @@ CWSmoother::CWSmoother() :
         m_fadeInSamples(0),
         m_fadeOutSamples(0)
 {
-    setNbFadeSamples(96); // default is 2ms at 48 kHz sample rate
+    setNbFadeSamples(192); // default is 4 ms at 48 kHz sample rate
 }
 
 CWSmoother::~CWSmoother()