diff --git a/owrx/connection.py b/owrx/connection.py
index d0c16fce..4f47b5cf 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -116,6 +116,7 @@ class OpenWebRxClient(Client, metaclass=ABCMeta):
 class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
     sdr_config_keys = [
         "waterfall_levels",
+        "waterfall_auto_level_default_mode",
         "samp_rate",
         "start_mod",
         "start_freq",
@@ -130,7 +131,6 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
         "waterfall_scheme",
         "waterfall_colors",
         "waterfall_auto_levels",
-        "waterfall_auto_level_default_mode",
         "waterfall_auto_min_range",
         "fft_size",
         "audio_compression",
diff --git a/owrx/controllers/settings/general.py b/owrx/controllers/settings/general.py
index 8c658d51..231a3c00 100644
--- a/owrx/controllers/settings/general.py
+++ b/owrx/controllers/settings/general.py
@@ -120,8 +120,8 @@ class GeneralSettingsController(SettingsFormController):
                 ),
                 CheckboxInput(
                     "waterfall_auto_level_default_mode",
-                    'Automatically adjust waterfall level by default',
-                    infotext="Enable this to automatically enable auto adjusting waterfall levels on page load."
+                    "Automatically adjust waterfall level by default",
+                    infotext="Enable this to automatically enable auto adjusting waterfall levels on page load.",
                 ),
                 NumberInput(
                     "waterfall_auto_min_range",
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 5e4efae5..fb5a9727 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -615,6 +615,11 @@ class SdrDeviceDescription(object):
                 + " device. <br/> Formula: Center frequency + oscillator offset = sdr tune frequency",
             ),
             WaterfallLevelsInput("waterfall_levels", "Waterfall levels"),
+            CheckboxInput(
+                "waterfall_auto_level_default_mode",
+                "Automatically adjust waterfall level by default",
+                infotext="Enable this to automatically enable auto adjusting waterfall levels on page load.",
+            ),
             SchedulerInput("scheduler", "Scheduler"),
             ExponentialInput("center_freq", "Center frequency", "Hz"),
             ExponentialInput("samp_rate", "Sample rate", "S/s"),
@@ -637,6 +642,7 @@ class SdrDeviceDescription(object):
             "rf_gain",
             "lfo_offset",
             "waterfall_levels",
+            "waterfall_auto_level_default_mode",
             "scheduler",
         ]
         if self.supportsPpm():
@@ -647,7 +653,13 @@ class SdrDeviceDescription(object):
         return ["name", "center_freq", "samp_rate", "start_freq", "start_mod"]
 
     def getProfileOptionalKeys(self):
-        return ["initial_squelch_level", "rf_gain", "lfo_offset", "waterfall_levels"]
+        return [
+            "initial_squelch_level",
+            "rf_gain",
+            "lfo_offset",
+            "waterfall_levels",
+            "waterfall_auto_level_default_mode",
+        ]
 
     def getDeviceSection(self):
         return OptionalSection(