diff --git a/Controllers/LogitechController/LogitechProtocolCommon.cpp b/Controllers/LogitechController/LogitechProtocolCommon.cpp
index 58bc62381..be59ee023 100644
--- a/Controllers/LogitechController/LogitechProtocolCommon.cpp
+++ b/Controllers/LogitechController/LogitechProtocolCommon.cpp
@@ -9,6 +9,17 @@
 
 #include <LogitechProtocolCommon.h>
 
+const char* logitech_led_locations[] =
+{
+    "Unknown",
+    "Primary",
+    "Logo",
+    "Left",
+    "Right"
+};
+
+const int NUM_LOGITECH_LED_LOCATIONS = sizeof(logitech_led_locations);
+
 static std::vector<uint16_t> logitech_RGB_pages =
 {
     LOGITECH_HIDPP_PAGE_RGB_EFFECTS1,
diff --git a/Controllers/LogitechController/LogitechProtocolCommon.h b/Controllers/LogitechController/LogitechProtocolCommon.h
index 47424a666..e38f1d991 100644
--- a/Controllers/LogitechController/LogitechProtocolCommon.h
+++ b/Controllers/LogitechController/LogitechProtocolCommon.h
@@ -77,13 +77,8 @@ enum LOGITECH_DEVICE_MODE
     LOGITECH_DEVICE_LED_CUSTOM          = 0x000C
 };
 
-static const char* logitech_led_locations[] = {
-    "Unknown",
-    "Primary",
-    "Logo",
-    "Left",
-    "Right"
-};
+extern const char* logitech_led_locations[];
+extern const int NUM_LOGITECH_LED_LOCATIONS;
 
 // Used for: {GET,SET}_REGISTER_{REQ,RSP}, SET_LONG_REGISTER_RSP, GET_LONG_REGISTER_REQ
 struct message_short
diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
index db34afe52..45fe0f6f9 100644
--- a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
@@ -139,7 +139,7 @@ void RGBController_LogitechLightspeed::SetupZones()
             led Lightspeed_logo_led;
             logitech_led new_led                    = controller->lightspeed->getLED_info(i);
 
-            if(new_led.location < sizeof(logitech_led_locations) )
+            if(new_led.location < NUM_LOGITECH_LED_LOCATIONS )
             {
                 Lightspeed_logo_zone.name           = logitech_led_locations[new_led.location];
                 Lightspeed_logo_zone.name.append(" ");