diff --git a/interface/src/app/main/SensorsAnalogDialog.tsx b/interface/src/app/main/SensorsAnalogDialog.tsx
index 2294a1991..5e43cde81 100644
--- a/interface/src/app/main/SensorsAnalogDialog.tsx
+++ b/interface/src/app/main/SensorsAnalogDialog.tsx
@@ -447,6 +447,7 @@ const SensorsAnalogDialog = ({
           <Box flexGrow={1} sx={{ '& button': { mt: 0 } }}>
             <Button
               startIcon={<RemoveIcon />}
+              disabled={editItem.s}
               variant="outlined"
               color="warning"
               onClick={remove}
diff --git a/interface/src/app/main/types.ts b/interface/src/app/main/types.ts
index d13775568..92b476c96 100644
--- a/interface/src/app/main/types.ts
+++ b/interface/src/app/main/types.ts
@@ -95,6 +95,7 @@ export interface AnalogSensor {
   f: number;
   t: number;
   d: boolean; // deleted flag
+  s: boolean; // system customization flag
   o_n?: string;
 }
 
diff --git a/src/core/analogsensor.cpp b/src/core/analogsensor.cpp
index 8aa69c0cc..3b39df74e 100644
--- a/src/core/analogsensor.cpp
+++ b/src/core/analogsensor.cpp
@@ -52,18 +52,23 @@ void AnalogSensor::start(const bool factory_settings) {
     // if (factory_settings && EMSESP::nvs_.getString("boot").equals("E32V2_2") && EMSESP::nvs_.getString("hwrevision").equals("3.0")) {
     if (factory_settings && analogReadMilliVolts(39) > 700) { // core voltage > 2.6V
         EMSESP::webCustomizationService.update([&](WebCustomization & settings) {
-            auto newSensor   = AnalogCustomization();
-            newSensor.gpio   = 39;
-            newSensor.name   = "core_voltage";
-            newSensor.offset = 0;
-            newSensor.factor = 0.00377136; // Divider 24k - 8,66k
-            newSensor.uom    = DeviceValueUOM::VOLTS;
-            newSensor.type   = AnalogType::ADC;
+            auto newSensor = AnalogCustomization();
+
+            newSensor.gpio      = 39;
+            newSensor.name      = "core_voltage";
+            newSensor.offset    = 0;
+            newSensor.factor    = 0.00377136; // Divider 24k - 8,66k
+            newSensor.uom       = DeviceValueUOM::VOLTS;
+            newSensor.type      = AnalogType::ADC;
+            newSensor.is_system = true;
             settings.analogCustomizations.push_back(newSensor);
-            newSensor.gpio   = 36;
-            newSensor.name   = "supply_voltage";
-            newSensor.factor = 0.017; // Divider 24k - 1,5k
+
+            newSensor.gpio      = 36;
+            newSensor.name      = "supply_voltage";
+            newSensor.factor    = 0.017; // Divider 24k - 1,5k
+            newSensor.is_system = true;
             settings.analogCustomizations.push_back(newSensor);
+
             return StateUpdateResult::CHANGED; // persist the change
         });
     }
@@ -469,7 +474,7 @@ void AnalogSensor::loop() {
 
 // update analog information name and offset
 // a type value of -1 is used to delete the sensor
-bool AnalogSensor::update(uint8_t gpio, std::string & name, double offset, double factor, uint8_t uom, int8_t type, bool deleted) {
+bool AnalogSensor::update(uint8_t gpio, std::string & name, double offset, double factor, uint8_t uom, int8_t type, bool deleted, bool is_system) {
     // first see if we can find the sensor in our customization list
     bool found_sensor = false;
     EMSESP::webCustomizationService.update([&](WebCustomization & settings) {
@@ -496,11 +501,12 @@ bool AnalogSensor::update(uint8_t gpio, std::string & name, double offset, doubl
                     if (name != AnalogCustomization.name) {
                         EMSESP::nvs_.remove(AnalogCustomization.name.c_str());
                     }
-                    AnalogCustomization.name   = name;
-                    AnalogCustomization.offset = offset;
-                    AnalogCustomization.factor = factor;
-                    AnalogCustomization.uom    = uom;
-                    AnalogCustomization.type   = type;
+                    AnalogCustomization.name      = name;
+                    AnalogCustomization.offset    = offset;
+                    AnalogCustomization.factor    = factor;
+                    AnalogCustomization.uom       = uom;
+                    AnalogCustomization.type      = type;
+                    AnalogCustomization.is_system = is_system;
                     LOG_DEBUG("Customizing existing analog GPIO %02d", gpio);
                 }
                 return StateUpdateResult::CHANGED; // persist the change
@@ -517,13 +523,14 @@ bool AnalogSensor::update(uint8_t gpio, std::string & name, double offset, doubl
     // we didn't find it, it's new, so create and store it in the customization list
     if (!found_sensor) {
         EMSESP::webCustomizationService.update([&](WebCustomization & settings) {
-            auto newSensor   = AnalogCustomization();
-            newSensor.gpio   = gpio;
-            newSensor.name   = name;
-            newSensor.offset = offset;
-            newSensor.factor = factor;
-            newSensor.uom    = uom;
-            newSensor.type   = type;
+            auto newSensor      = AnalogCustomization();
+            newSensor.gpio      = gpio;
+            newSensor.name      = name;
+            newSensor.offset    = offset;
+            newSensor.factor    = factor;
+            newSensor.uom       = uom;
+            newSensor.type      = type;
+            newSensor.is_system = false;
             settings.analogCustomizations.push_back(newSensor);
             LOG_DEBUG("Adding new customization for analog sensor GPIO %02d", gpio);
             return StateUpdateResult::CHANGED; // persist the change
@@ -836,7 +843,8 @@ void AnalogSensor::get_value_json(JsonObject output, const Sensor & sensor) {
     output["readable"]  = true;
     output["writeable"] = sensor.type() == AnalogType::COUNTER || sensor.type() == AnalogType::RGB || sensor.type() == AnalogType::PULSE
                           || (sensor.type() >= AnalogType::DIGITAL_OUT && sensor.type() <= AnalogType::PWM_2);
-    output["visible"] = true;
+    output["visible"]   = true;
+    output["is_system"] = sensor.is_system();
     if (sensor.type() == AnalogType::COUNTER) {
         output["min"]         = 0;
         output["max"]         = 4000000;
diff --git a/src/core/analogsensor.h b/src/core/analogsensor.h
index 7125a2b3b..83e8ed4a9 100644
--- a/src/core/analogsensor.h
+++ b/src/core/analogsensor.h
@@ -61,6 +61,10 @@ class AnalogSensor {
             value_ = value;
         }
 
+        bool is_system() const {
+            return is_system_;
+        }
+
         double factor() const {
             return factor_;
         }
@@ -105,8 +109,9 @@ class AnalogSensor {
         double      offset_;
         double      factor_;
         uint8_t     uom_;
-        double      value_; // double because of the factor is a double
-        int8_t      type_;  // one of the AnalogType enum
+        double      value_;     // double because of the factor is a double
+        int8_t      type_;      // one of the AnalogType enum
+        bool        is_system_; // if true, the sensor is a system sensor
     };
 
     AnalogSensor()  = default;
@@ -167,7 +172,7 @@ class AnalogSensor {
         return sensors_.size();
     }
 
-    bool update(uint8_t gpio, std::string & name, double offset, double factor, uint8_t uom, int8_t type, bool deleted = false);
+    bool update(uint8_t gpio, std::string & name, double offset, double factor, uint8_t uom, int8_t type, bool deleted = false, bool is_system = false);
     bool get_value_info(JsonObject output, const char * cmd, const int8_t id = -1);
     void store_counters();
 
diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp
index d1068861d..30a510376 100644
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -63,13 +63,14 @@ void WebCustomization::read(WebCustomization & customizations, JsonObject root)
     // Analog Sensor customization
     JsonArray analogJson = root["as"].to<JsonArray>();
     for (const AnalogCustomization & sensor : customizations.analogCustomizations) {
-        JsonObject sensorJson = analogJson.add<JsonObject>();
-        sensorJson["gpio"]    = sensor.gpio;   // g
-        sensorJson["name"]    = sensor.name;   // n
-        sensorJson["offset"]  = sensor.offset; // o
-        sensorJson["factor"]  = sensor.factor; // f
-        sensorJson["uom"]     = sensor.uom;    // u
-        sensorJson["type"]    = sensor.type;   // t
+        JsonObject sensorJson   = analogJson.add<JsonObject>();
+        sensorJson["gpio"]      = sensor.gpio;      // g
+        sensorJson["name"]      = sensor.name;      // n
+        sensorJson["offset"]    = sensor.offset;    // o
+        sensorJson["factor"]    = sensor.factor;    // f
+        sensorJson["uom"]       = sensor.uom;       // u
+        sensorJson["type"]      = sensor.type;      // t
+        sensorJson["is_system"] = sensor.is_system; // s
     }
 
     // Masked entities customization and custom device name (optional)
@@ -115,13 +116,14 @@ StateUpdateResult WebCustomization::update(JsonObject root, WebCustomization & c
         auto analogJsons = root["as"].as<JsonArray>();
         for (const JsonObject analogJson : analogJsons) {
             // create each of the sensor, overwriting any previous settings
-            auto analog   = AnalogCustomization();
-            analog.gpio   = analogJson["gpio"];
-            analog.name   = analogJson["name"].as<std::string>();
-            analog.offset = analogJson["offset"];
-            analog.factor = analogJson["factor"];
-            analog.uom    = analogJson["uom"];
-            analog.type   = analogJson["type"];
+            auto analog      = AnalogCustomization();
+            analog.gpio      = analogJson["gpio"];
+            analog.name      = analogJson["name"].as<std::string>();
+            analog.offset    = analogJson["offset"];
+            analog.factor    = analogJson["factor"];
+            analog.uom       = analogJson["uom"];
+            analog.type      = analogJson["type"];
+            analog.is_system = analogJson["is_system"];
             if (_start && analog.type == EMSESP::analogsensor_.AnalogType::DIGITAL_OUT && analog.uom > DeviceValue::DeviceValueUOM::NONE) {
                 analog.offset = analog.uom - 1;
             }
diff --git a/src/web/WebCustomizationService.h b/src/web/WebCustomizationService.h
index f12e5db33..9b416d213 100644
--- a/src/web/WebCustomizationService.h
+++ b/src/web/WebCustomizationService.h
@@ -45,8 +45,9 @@ class AnalogCustomization {
     std::string name;
     double      offset;
     double      factor;
-    uint8_t     uom;  // 0 is none
-    int8_t      type; // -1 is for deletion
+    uint8_t     uom;               // 0 is none
+    int8_t      type;              // -1 is for deletion
+    bool        is_system = false; // if true, the customization is a system customization
 
     // used for removing from a list
     bool operator==(const AnalogCustomization & a) const {
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index 735a35182..df4db1f3f 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -143,6 +143,7 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
             obj["o"]       = sensor.offset();
             obj["f"]       = sensor.factor();
             obj["t"]       = sensor.type();
+            obj["s"]       = sensor.is_system();
 
             if (sensor.type() != AnalogSensor::AnalogType::NOTUSED) {
                 obj["v"] = Helpers::transformNumFloat(sensor.value()); // is optional and is a float