diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx
index 84455c077..61841d305 100644
--- a/interface/src/app/settings/ApplicationSettings.tsx
+++ b/interface/src/app/settings/ApplicationSettings.tsx
@@ -502,7 +502,7 @@ const ApplicationSettings = () => {
           ) : (
             boardProfileItems
           )}
-          <Divider />
+          {(data.board_profile === 'CUSTOM' || data.developer_mode) && <Divider />}
           {(data.board_profile === 'CUSTOM' || data.developer_mode) && (
             <MenuItem key={'CUSTOM'} value={'CUSTOM'}>
               {LL.CUSTOM()}&hellip;
diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp
index b16501634..5d2dc0354 100644
--- a/src/web/WebSettingsService.cpp
+++ b/src/web/WebSettingsService.cpp
@@ -436,6 +436,7 @@ void WebSettings::set_board_profile(WebSettings & settings) {
     // as it's already set
     if (settings.board_profile == "CUSTOM") {
         EMSESP::logger().info("Using CUSTOM board profile");
+        EMSESP::system_.set_valid_system_gpios();
         return;
     }