diff --git a/src/Core/Services/Implementations/PolicyService.cs b/src/Core/Services/Implementations/PolicyService.cs
index a8d4f7ac9346..f7ba081b4bb7 100644
--- a/src/Core/Services/Implementations/PolicyService.cs
+++ b/src/Core/Services/Implementations/PolicyService.cs
@@ -73,6 +73,14 @@ public async Task SaveAsync(Policy policy, IUserService userService, IOrganizati
                     await DependsOnSingleOrgAsync(org);
                 }
                 break;
+
+            // Activate Autofill is only available to Enterprise 2020-current plans
+            case PolicyType.ActivateAutofill:
+                if (policy.Enabled)
+                {
+                    LockedTo2020Plan(org);
+                }
+                break;
         }
 
         var now = DateTime.UtcNow;
@@ -168,4 +176,12 @@ private async Task RequiredByVaultTimeoutAsync(Organization org)
             throw new BadRequestException("Maximum Vault Timeout policy is enabled.");
         }
     }
+
+    private void LockedTo2020Plan(Organization org)
+    {
+        if (org.PlanType != PlanType.EnterpriseAnnually && org.PlanType != PlanType.EnterpriseMonthly)
+        {
+            throw new BadRequestException("This policy is only available to 2020 Enterprise plans.");
+        }
+    }
 }