diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Models/Business/OrganizationLicense.cs
index c9d6724184..837fcfcae5 100644
--- a/src/Core/Models/Business/OrganizationLicense.cs
+++ b/src/Core/Models/Business/OrganizationLicense.cs
@@ -328,6 +328,11 @@ public class OrganizationLicense : ILicense
                 valid = organization.UseCustomPermissions == UseCustomPermissions;
             }
 
+            if (valid && Version >= 12)
+            {
+                valid = organization.ExpirationDate == ExpirationWithoutGracePeriod;
+            }
+
             if (valid && Version >= 13)
             {
                 valid = organization.UseSecretsManager == UseSecretsManager &&