diff --git a/src/IoTHub.Portal.Client/Pages/Layer/LayerDetailsPage.razor b/src/IoTHub.Portal.Client/Pages/Layer/LayerDetailsPage.razor
index 8e091bd09..868fe11d5 100644
--- a/src/IoTHub.Portal.Client/Pages/Layer/LayerDetailsPage.razor
+++ b/src/IoTHub.Portal.Client/Pages/Layer/LayerDetailsPage.razor
@@ -13,7 +13,7 @@
     public List<LayerDto> InitLayers = new List<LayerDto>();
 
     [Parameter]
-    public string LayerId { get; set; }
+    public string? LayerId { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
diff --git a/src/IoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs b/src/IoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
index d0a213f7b..e0ad39b13 100644
--- a/src/IoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
+++ b/src/IoTHub.Portal.Shared/Models/v1.0/DeviceDetails.cs
@@ -77,6 +77,6 @@ public class DeviceDetails : IDeviceDetails
         /// <summary>
         /// The LayerId of the device.
         /// </summary>
-        public string LayerId { get; set; }
+        public string? LayerId { get; set; }
     }
 }
diff --git a/src/IoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs b/src/IoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
index 6722d8798..22b5c95d9 100644
--- a/src/IoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
+++ b/src/IoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
@@ -65,6 +65,6 @@ public class DeviceListItem
         /// <summary>
         /// The LayerId of the device.
         /// </summary>
-        public string LayerId { get; set; }
+        public string? LayerId { get; set; }
     }
 }
diff --git a/src/IoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs b/src/IoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
index 1cc7e953a..349e95f5a 100644
--- a/src/IoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
+++ b/src/IoTHub.Portal.Shared/Models/v1.0/Filters/DeviceListFilter.cs
@@ -19,6 +19,6 @@ public class DeviceListFilter : PaginationFilter
 
         public List<string> Labels { get; set; } = new();
 
-        public string LayerId { get; set; } = default!;
+        public string? LayerId { get; set; } = default!;
     }
 }
diff --git a/src/IoTHub.Portal.Shared/Models/v1.0/IDeviceDetails.cs b/src/IoTHub.Portal.Shared/Models/v1.0/IDeviceDetails.cs
index 9e4a3f762..688f4a1df 100644
--- a/src/IoTHub.Portal.Shared/Models/v1.0/IDeviceDetails.cs
+++ b/src/IoTHub.Portal.Shared/Models/v1.0/IDeviceDetails.cs
@@ -62,6 +62,6 @@ public interface IDeviceDetails
         /// <summary>
         /// The LayerId of the device.
         /// </summary>
-        public string LayerId { get; set; }
+        public string? LayerId { get; set; }
     }
 }
diff --git a/src/IoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs b/src/IoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
index 7a9c16bda..dc67cf776 100644
--- a/src/IoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
+++ b/src/IoTHub.Portal.Shared/Models/v1.0/LoRaWAN/LoRaDeviceDetails.cs
@@ -148,7 +148,7 @@ public class LoRaDeviceDetails : LoRaDeviceBase, IDeviceDetails
         /// <summary>
         /// The LayerId of the device.
         /// </summary>
-        public string LayerId { get; set; } = default!;
+        public string? LayerId { get; set; } = default!;
 
         /// <summary>
         /// A value indicating whether the downlinks are enabled (True if not provided)