diff --git a/projects/Infrastructure/Extensions/HelperExtensions.cs b/projects/Infrastructure/Extensions/HelperExtensions.cs
index 61b9e212..53c1df9d 100644
--- a/projects/Infrastructure/Extensions/HelperExtensions.cs
+++ b/projects/Infrastructure/Extensions/HelperExtensions.cs
@@ -47,7 +47,8 @@ namespace Infrastructure.Extensions
         {
             return NetworkInterface
                 .GetAllNetworkInterfaces()
-                .Where(nic => nic.NetworkInterfaceType == NetworkInterfaceType.Ethernet && !nic.Description.Contains("Adapter"))
+                .Where(nic => (nic.NetworkInterfaceType == NetworkInterfaceType.Ethernet || nic.NetworkInterfaceType == NetworkInterfaceType.Wireless80211) && !nic.Description.Contains("Adapter"))
+                .OrderBy(o => o.NetworkInterfaceType)
                 .Select(o => o.GetPhysicalAddress().ToString().ToLower())
                 .FirstOrDefault();
         }