diff --git a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
index 03dcdcd..f2d80ce 100644
--- a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
+++ b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
@@ -156,7 +156,7 @@ namespace RGB.NET.Devices.Corsair
                                 int channelDeviceInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelDeviceInfo));
                                 IntPtr channelDeviceInfoPtr = channelInfo.devices;
 
-                                for (int device = 0; device < channelInfo.devicesCount; device++)
+                                for (int device = 0; (device < channelInfo.devicesCount) && (ledOffset < nativeDeviceInfo.ledsCount); device++)
                                 {
                                     _CorsairChannelDeviceInfo channelDeviceInfo = (_CorsairChannelDeviceInfo)Marshal.PtrToStructure(channelDeviceInfoPtr, typeof(_CorsairChannelDeviceInfo))!;
 
diff --git a/RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDeviceInfo.cs
index d6e222d..259c409 100644
--- a/RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDeviceInfo.cs
@@ -81,7 +81,7 @@ namespace RGB.NET.Devices.Corsair
             switch (channelDeviceInfo.type)
             {
                 case CorsairChannelDeviceType.Invalid:
-                    return "Invalid";
+                    return model;
 
                 case CorsairChannelDeviceType.FanHD:
                     return "HD Fan";
diff --git a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
index 8033837..5b41eef 100644
--- a/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Generic/CorsairRGBDeviceInfo.cs
@@ -36,6 +36,12 @@ namespace RGB.NET.Devices.Corsair
         /// <inheritdoc />
         public string Model { get; }
 
+        /// <summary>
+        /// Returns the unique ID provided by the Corsair-SDK.
+        /// Returns string.Empty for Custom devices.
+        /// </summary>
+        public string DeviceId { get; }
+
         /// <inheritdoc />
         public object? LayoutMetadata { get; set; }
 
@@ -60,6 +66,7 @@ namespace RGB.NET.Devices.Corsair
             this.DeviceType = deviceType;
             this.CorsairDeviceType = nativeInfo.type;
             this.Model = nativeInfo.model == IntPtr.Zero ? string.Empty : Regex.Replace(Marshal.PtrToStringAnsi(nativeInfo.model) ?? string.Empty, " ?DEMO", string.Empty, RegexOptions.IgnoreCase);
+            this.DeviceId = nativeInfo.deviceId ?? string.Empty;
             this.CapsMask = (CorsairDeviceCaps)nativeInfo.capsMask;
 
             DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model);
@@ -78,6 +85,7 @@ namespace RGB.NET.Devices.Corsair
             this.DeviceType = deviceType;
             this.CorsairDeviceType = nativeInfo.type;
             this.Model = modelName;
+            this.DeviceId = nativeInfo.deviceId ?? string.Empty;
             this.CapsMask = (CorsairDeviceCaps)nativeInfo.capsMask;
 
             DeviceName = DeviceHelper.CreateDeviceName(Manufacturer, Model);
diff --git a/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs b/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs
index 418e9f6..da35dbf 100644
--- a/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs
+++ b/RGB.NET.Devices.Corsair/Native/_CorsairDeviceInfo.cs
@@ -48,5 +48,11 @@ namespace RGB.NET.Devices.Corsair.Native
         /// CUE-SDK: structure that describes channels of the DIY-devices
         /// </summary>
         internal _CorsairChannelsInfo? channels;
+
+        /// <summary>
+        /// CUE-SDK: null-terminated string that contains unique device identifier that uniquely identifies device at least within session
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+        internal string? deviceId;
     }
 }