diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp
index fa62d8f..94c6661 100644
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -64,13 +64,17 @@ String processor(const String &var)
     return String(LubeConfig.BleedingPulses);
   if (var == "SPEED_SOURCE")
     return String(SpeedSourceString[LubeConfig.SpeedSource]);
-#ifdef FEATURE_ENABLE_GPS
   if (var == "GPS_BAUD")
+#ifdef FEATURE_ENABLE_GPS
     return String(GPSBaudRateString[LubeConfig.GPSBaudRate]);
+#else
+    return "Feature N/A";
 #endif
-#ifdef FEATURE_ENABLE_CAN
   if (var == "CAN_SOURCE")
+#ifdef FEATURE_ENABLE_CAN
     return String(CANSourceString[LubeConfig.CANSource]);
+#else
+    return "Feature N/A";
 #endif
   if (var == "CONFIG_CHECKSUM")
   {