diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx
index 777e3c734..37130fbad 100644
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -244,6 +244,7 @@ const SettingsCustomization: FC = () => {
       const selected_device = parseInt(event.target.value, 10);
       setSelectedDevice(selected_device);
       fetchDeviceEntities(devices?.devices[selected_device].i);
+      setRestartNeeded(false);
     }
   };
 
diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp
index 39efe4ccf..06141f735 100644
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -269,8 +269,7 @@ void WebCustomizationService::custom_entities(AsyncWebServerRequest * request, J
                                         bool is_set = false;
                                         for (const JsonVariant id : entity_ids_json) {
                                             std::string id_s = id.as<std::string>();
-                                            id_s             = DeviceValue::get_name(id_s);
-                                            if (id_s == name) {
+                                            if (name == DeviceValue::get_name(id_s)) {
                                                 is_set      = true;
                                                 need_reboot = true;
                                                 break;