diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseStatus.cs b/XenAdmin/Dialogs/LicenseManager/LicenseStatus.cs
index f6a98c269..9fa63acac 100644
--- a/XenAdmin/Dialogs/LicenseManager/LicenseStatus.cs
+++ b/XenAdmin/Dialogs/LicenseManager/LicenseStatus.cs
@@ -240,7 +240,7 @@ namespace XenAdmin.Dialogs
                 return HostState.ExpiresSoon;
             }
 
-            return HostState.Free;
+            return LicenseEdition ==  Host.Edition.Free ? HostState.Free : HostState.Licensed;
         }
 
         #region ILicenseStatus Members