diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index 739e847d8..67e1002d5 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -414,7 +414,7 @@ void NFMDemod::applyAudioSampleRate(int sampleRate)
     m_squelchCount = 0; // reset squelch open counter
     m_ctcssDetector.setCoefficients(sampleRate/16, sampleRate/8.0f); // 0.5s / 2 Hz resolution
     m_afSquelch.setCoefficients(sampleRate/2000, 600, sampleRate, 200, 0); // 0.5ms test period, 300ms average span, audio SR, 100ms attack, no decay
-    m_phaseDiscri.setFMScaling((8.0f*sampleRate) / static_cast<float>(m_settings.m_fmDeviation)); // integrate 4x factor
+    m_phaseDiscri.setFMScaling(sampleRate / static_cast<float>(m_settings.m_fmDeviation));
     m_audioFifo.setSize(sampleRate);
     m_settingsMutex.unlock();
 
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui
index 5dc1a095b..8a1a94f51 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.ui
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui
@@ -330,7 +330,7 @@
          <string>Sound volume</string>
         </property>
         <property name="maximum">
-         <number>20</number>
+         <number>40</number>
         </property>
         <property name="pageStep">
          <number>1</number>
diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
index cceb0540d..718404ecd 100644
--- a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp
@@ -25,8 +25,8 @@
 const int NFMDemodSettings::m_rfBW[] = {
     5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
 };
-const int NFMDemodSettings::m_fmDev[] = { // corresponding FM deviations
-    1000, 1500, 2000, 2000,  2000,  2500,  3000,  3500,  5000
+const int NFMDemodSettings::m_fmDev[] = { // corresponding single side FM deviations at 0.4 * BW
+    2000, 2500, 3330, 4000,  5000,  6000,  8000,  10000,  16000
 };
 const int NFMDemodSettings::m_nbRfBW = 9;