diff --git a/photon-server/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java b/photon-server/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java
index 293a63407..2cdf66096 100644
--- a/photon-server/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java
+++ b/photon-server/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java
@@ -102,7 +102,7 @@ public class PhotonConfiguration {
 
         var lightingConfig = new UILightingConfig();
         lightingConfig.brightness = hardwareSettings.ledBrightnessPercentage;
-        lightingConfig.supported = Platform.isRaspberryPi(); // TODO check non pi??
+        lightingConfig.supported = (hardwareConfig.ledPins.size() != 0);
         settingsSubmap.put("lighting", SerializationUtils.objectToHashMap(lightingConfig));
 
         var generalSubmap = new HashMap<String, Object>();
diff --git a/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java b/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java
index 5bf5b5941..c8f5da539 100644
--- a/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java
+++ b/photon-server/src/main/java/org/photonvision/vision/processes/VisionModule.java
@@ -131,7 +131,10 @@ public class VisionModule {
             var fov = ConfigManager.getInstance().getConfig().getHardwareConfig().vendorFOV;
             logger.info("Setting FOV of vendor camera to " + fov);
             visionSource.getSettables().setFOV(fov);
+        }
 
+        // Configure LED's if supported by the underlying hardware
+        if (HardwareManager.getInstance().visionLED != null) {
             HardwareManager.getInstance()
                     .visionLED
                     .setPipelineModeSupplier(() -> pipelineManager.getCurrentPipelineSettings().ledMode);
@@ -271,7 +274,8 @@ public class VisionModule {
     }
 
     private void setVisionLEDs(boolean on) {
-        if (isVendorCamera()) HardwareManager.getInstance().visionLED.setState(on);
+        if (HardwareManager.getInstance().visionLED != null)
+            HardwareManager.getInstance().visionLED.setState(on);
     }
 
     public void saveModule() {