diff --git a/backend/fan.py b/backend/fan.py
index 1201ff8..fb23b03 100755
--- a/backend/fan.py
+++ b/backend/fan.py
@@ -129,7 +129,14 @@ def parse_fan_configuration(self):
                     fan_config.FAN_HWMON_INPUT_PATH = name_path_map[fan_hwmon_label_input]+"/"+fan_pwm_input["pwm_read_path"]
                     fan_config.fan_value_max = fan_pwm_input["pwm_read_max"] if "pwm_read_max" in fan_pwm_input else 0
                     max_value_from_settings = self.settings.getSetting(f"fan{len(self.fan_config_list)}_max")
-                    fan_config.FAN_RPMVALUE_MAX = max_value_from_settings if max_value_from_settings > fan_config.fan_value_max else fan_config.fan_value_max
+                    fan_config.FAN_RPMVALUE_MAX = (
+                        max_value_from_settings
+                        if (
+                            max_value_from_settings != None
+                            and max_value_from_settings > fan_config.fan_value_max
+                        )
+                        else fan_config.fan_value_max
+                    )
                     fan_config.TEMP_MODE = hwmon_config["temp_mode"]
                     self.fan_config_list.append(fan_config)
                 except:
diff --git a/package.json b/package.json
index 87cec92..333c5b1 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PowerControl",
-  "version": "2.4.16",
+  "version": "2.4.17",
   "description": "PowerControl plugin.",
   "scripts": {
     "build": "shx rm -rf dist && rollup -c",