diff --git a/src/Api/Auth/Controllers/WebAuthnController.cs b/src/Api/Auth/Controllers/WebAuthnController.cs
index d36b8cf97..437c1ba20 100644
--- a/src/Api/Auth/Controllers/WebAuthnController.cs
+++ b/src/Api/Auth/Controllers/WebAuthnController.cs
@@ -13,7 +13,6 @@ using Bit.Core.Auth.UserFeatures.WebAuthnLogin;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Tokens;
-using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -21,7 +20,6 @@ namespace Bit.Api.Auth.Controllers;
 
 [Route("webauthn")]
 [Authorize("Web")]
-[RequireFeature(FeatureFlagKeys.PasswordlessLogin)]
 public class WebAuthnController : Controller
 {
     private readonly IUserService _userService;
diff --git a/src/Identity/Controllers/AccountsController.cs b/src/Identity/Controllers/AccountsController.cs
index fe91eeede..e6b5cfc26 100644
--- a/src/Identity/Controllers/AccountsController.cs
+++ b/src/Identity/Controllers/AccountsController.cs
@@ -12,7 +12,6 @@ using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Tokens;
-using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
@@ -85,7 +84,6 @@ public class AccountsController : Controller
     }
 
     [HttpGet("webauthn/assertion-options")]
-    [RequireFeature(FeatureFlagKeys.PasswordlessLogin)]
     public WebAuthnLoginAssertionOptionsResponseModel GetWebAuthnLoginAssertionOptions()
     {
         var options = _getWebAuthnLoginCredentialAssertionOptionsCommand.GetWebAuthnLoginCredentialAssertionOptions();
diff --git a/src/Identity/IdentityServer/WebAuthnGrantValidator.cs b/src/Identity/IdentityServer/WebAuthnGrantValidator.cs
index fed631eb3..855226565 100644
--- a/src/Identity/IdentityServer/WebAuthnGrantValidator.cs
+++ b/src/Identity/IdentityServer/WebAuthnGrantValidator.cs
@@ -65,12 +65,6 @@ public class WebAuthnGrantValidator : BaseRequestValidator<ExtensionGrantValidat
 
     public async Task ValidateAsync(ExtensionGrantValidationContext context)
     {
-        if (!FeatureService.IsEnabled(FeatureFlagKeys.PasswordlessLogin))
-        {
-            context.Result = new GrantValidationResult(TokenRequestErrors.InvalidGrant);
-            return;
-        }
-
         var rawToken = context.Request.Raw.Get("token");
         var rawDeviceResponse = context.Request.Raw.Get("deviceResponse");
         if (string.IsNullOrWhiteSpace(rawToken) || string.IsNullOrWhiteSpace(rawDeviceResponse))