diff --git a/src/IoTHub.Portal.Application/Mappers/EdgeDeviceProfile.cs b/src/IoTHub.Portal.Application/Mappers/EdgeDeviceProfile.cs
index 39415e918..54a8f9609 100644
--- a/src/IoTHub.Portal.Application/Mappers/EdgeDeviceProfile.cs
+++ b/src/IoTHub.Portal.Application/Mappers/EdgeDeviceProfile.cs
@@ -63,7 +63,7 @@ public EdgeDeviceProfile()
                 .ForMember(dest => dest.DeviceName, opts => opts.MapFrom(src => src.Name))
                 .ForMember(dest => dest.NbDevices, opts => opts.MapFrom(src => src.NbDevices))
                 .ForMember(dest => dest.ImageUrl, opts => opts.MapFrom((src, _, _, context) => context.Items["imageUrl"]))
-                .ForMember(dest => dest.Status, opts => opts.MapFrom(src => src.IsEnabled ? DeviceStatus.Enabled.ToString() : DeviceStatus.Disabled.ToString()))
+                .ForMember(dest => dest.Status, opts => opts.MapFrom(src => src.ConnectionState))
                 .ForMember(dest => dest.Labels, opts => opts.MapFrom(src => src.Labels.Union(src.DeviceModel.Labels)));
         }
 
diff --git a/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor b/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
index 4dfde48a0..009a0e21b 100644
--- a/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
+++ b/src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
@@ -60,10 +60,10 @@
                         <MudText>Status</MudText>
                         <MudRadioGroup @bind-SelectedOption="@searchModel.Status" Style="display:flex;align-items:baseline">
                             <MudItem md="4" sm="12">
-                                <MudRadio Option=@("true") Color="Color.Primary">Enabled</MudRadio>
+                                <MudRadio Option=@("true") Color="Color.Primary">Connected</MudRadio>
                             </MudItem>
                             <MudItem md="4" sm="12">
-                                <MudRadio Option=@("false") Color="Color.Primary">Disabled</MudRadio>
+                                <MudRadio Option=@("false") Color="Color.Primary">Disconnected</MudRadio>
                             </MudItem>
                             <MudItem md="4" sm="12">
                                 <MudRadio Option=@("true") Color="Color.Secondary">All</MudRadio>
@@ -102,8 +102,8 @@
             <HeaderContent>
                 <MudTh></MudTh>
                 <MudTh><MudTableSortLabel SortLabel="Id" T="IoTEdgeListItem" id="sortDeviceId">Device ID</MudTableSortLabel></MudTh>
-                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsEnabled" T="IoTEdgeListItem">Allowed</MudTableSortLabel></MudTh>
-                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="NbDevices" T="IoTEdgeListItem">Nb devices</MudTableSortLabel></MudTh>
+                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsEnabled" T="IoTEdgeListItem">Connected</MudTableSortLabel></MudTh>
+                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="NbDevices" T="IoTEdgeListItem">Connected leaf devices</MudTableSortLabel></MudTh>
                 <MudTh Style="text-align: center">See details</MudTh>
                 <MudTh Style="text-align: center">Delete</MudTh>
             </HeaderContent>
@@ -123,13 +123,13 @@
                 <MudTd DataLabel="Status" Style="text-align: center">
                     @if (context.Status == "Enabled")
                     {
-                        <MudTooltip Text="Device can connect">
+                        <MudTooltip Text="Device is connected">
                             <MudIcon Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success" />
                         </MudTooltip>
                     }
                     else
                     {
-                        <MudTooltip Text="Device cannot connect">
+                        <MudTooltip Text="Device is disconnected">
                             <MudIcon Icon="@Icons.Material.Filled.Error" Color="Color.Default" />
                         </MudTooltip>
                     }
diff --git a/src/IoTHub.Portal.Infrastructure/Services/EdgeDevicesServiceBase.cs b/src/IoTHub.Portal.Infrastructure/Services/EdgeDevicesServiceBase.cs
index 8f2741b0c..f919e8dc7 100644
--- a/src/IoTHub.Portal.Infrastructure/Services/EdgeDevicesServiceBase.cs
+++ b/src/IoTHub.Portal.Infrastructure/Services/EdgeDevicesServiceBase.cs
@@ -70,7 +70,7 @@ public async Task<PaginatedResult<IoTEdgeListItem>> GetEdgeDevicesPage(
 
             if (deviceListFilter.IsEnabled != null)
             {
-                devicePredicate = devicePredicate.And(device => device.IsEnabled.Equals(deviceListFilter.IsEnabled));
+                devicePredicate = devicePredicate.And(device => device.ConnectionState.Equals(deviceListFilter.IsEnabled.Value ? "Connected" : "Disconnected"));
             }
 
             if (!string.IsNullOrWhiteSpace(deviceListFilter.ModelId))