diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
index d7782fcd986f..e4dc7b7708aa 100644
--- a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
+++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs
@@ -15,17 +15,20 @@ public class CloudGetOrganizationLicenseQuery : ICloudGetOrganizationLicenseQuer
     private readonly IPaymentService _paymentService;
     private readonly ILicensingService _licensingService;
     private readonly IProviderRepository _providerRepository;
+    private readonly IFeatureService _featureService;
 
     public CloudGetOrganizationLicenseQuery(
         IInstallationRepository installationRepository,
         IPaymentService paymentService,
         ILicensingService licensingService,
-        IProviderRepository providerRepository)
+        IProviderRepository providerRepository,
+        IFeatureService featureService)
     {
         _installationRepository = installationRepository;
         _paymentService = paymentService;
         _licensingService = licensingService;
         _providerRepository = providerRepository;
+        _featureService = featureService;
     }
 
     public async Task<OrganizationLicense> GetLicenseAsync(Organization organization, Guid installationId,
@@ -38,11 +41,13 @@ public async Task<OrganizationLicense> GetLicenseAsync(Organization organization
         }
 
         var subscriptionInfo = await GetSubscriptionAsync(organization);
-
-        return new OrganizationLicense(organization, subscriptionInfo, installationId, _licensingService, version)
+        var license = new OrganizationLicense(organization, subscriptionInfo, installationId, _licensingService, version);
+        if (_featureService.IsEnabled(FeatureFlagKeys.SelfHostLicenseRefactor))
         {
-            Token = await _licensingService.CreateOrganizationTokenAsync(organization, installationId, subscriptionInfo)
-        };
+            license.Token = await _licensingService.CreateOrganizationTokenAsync(organization, installationId, subscriptionInfo);
+        }
+
+        return license;
     }
 
     private async Task<SubscriptionInfo> GetSubscriptionAsync(Organization organization)
diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs
index 866f0bb6e1d8..dd603b4b63de 100644
--- a/src/Core/Services/Implementations/LicensingService.cs
+++ b/src/Core/Services/Implementations/LicensingService.cs
@@ -30,7 +30,6 @@ public class LicensingService : ILicensingService
     private readonly ILogger<LicensingService> _logger;
     private readonly ILicenseClaimsFactory<Organization> _organizationLicenseClaimsFactory;
     private readonly ILicenseClaimsFactory<User> _userLicenseClaimsFactory;
-    private readonly IFeatureService _featureService;
 
     private IDictionary<Guid, DateTime> _userCheckCache = new Dictionary<Guid, DateTime>();
 
@@ -42,7 +41,6 @@ public LicensingService(
         ILogger<LicensingService> logger,
         IGlobalSettings globalSettings,
         ILicenseClaimsFactory<Organization> organizationLicenseClaimsFactory,
-        IFeatureService featureService,
         ILicenseClaimsFactory<User> userLicenseClaimsFactory)
     {
         _userRepository = userRepository;
@@ -51,7 +49,6 @@ public LicensingService(
         _logger = logger;
         _globalSettings = globalSettings;
         _organizationLicenseClaimsFactory = organizationLicenseClaimsFactory;
-        _featureService = featureService;
         _userLicenseClaimsFactory = userLicenseClaimsFactory;
 
         var certThumbprint = environment.IsDevelopment() ?
@@ -344,11 +341,6 @@ public ClaimsPrincipal GetClaimsPrincipalFromLicense(ILicense license)
 
     public async Task<string> CreateOrganizationTokenAsync(Organization organization, Guid installationId, SubscriptionInfo subscriptionInfo)
     {
-        if (!_featureService.IsEnabled(FeatureFlagKeys.SelfHostLicenseRefactor))
-        {
-            return null;
-        }
-
         var licenseContext = new LicenseContext
         {
             InstallationId = installationId,
@@ -363,11 +355,6 @@ public async Task<string> CreateOrganizationTokenAsync(Organization organization
 
     public async Task<string> CreateUserTokenAsync(User user, SubscriptionInfo subscriptionInfo)
     {
-        if (!_featureService.IsEnabled(FeatureFlagKeys.SelfHostLicenseRefactor))
-        {
-            return null;
-        }
-
         var licenseContext = new LicenseContext { SubscriptionInfo = subscriptionInfo };
         var claims = await _userLicenseClaimsFactory.GenerateClaims(user, licenseContext);
         var audience = $"user:{user.Id}";
diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
index 85bd0301c38b..e67c8f789ac3 100644
--- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
+++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
@@ -234,7 +234,7 @@ public static void AddDefaultServices(this IServiceCollection services, GlobalSe
         services.AddScoped<IPaymentHistoryService, PaymentHistoryService>();
         services.AddSingleton<IStripeSyncService, StripeSyncService>();
         services.AddSingleton<IMailService, HandlebarsMailService>();
-        services.AddScoped<ILicensingService, LicensingService>();
+        services.AddSingleton<ILicensingService, LicensingService>();
         services.AddSingleton<ILookupClient>(_ =>
         {
             var options = new LookupClientOptions { Timeout = TimeSpan.FromSeconds(15), UseTcpOnly = true };
diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
index 52bee7068fd5..337cfb404227 100644
--- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs
@@ -57,6 +57,7 @@ public async Task GetLicenseAsync_CreatesAndReturns(SutProvider<CloudGetOrganiza
         sutProvider.GetDependency<IInstallationRepository>().GetByIdAsync(installationId).Returns(installation);
         sutProvider.GetDependency<IPaymentService>().GetSubscriptionAsync(organization).Returns(subInfo);
         sutProvider.GetDependency<ILicensingService>().SignLicense(Arg.Any<ILicense>()).Returns(licenseSignature);
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.SelfHostLicenseRefactor).Returns(false);
 
         var result = await sutProvider.Sut.GetLicenseAsync(organization, installationId);
 
@@ -64,6 +65,27 @@ public async Task GetLicenseAsync_CreatesAndReturns(SutProvider<CloudGetOrganiza
         Assert.Equal(organization.Id, result.Id);
         Assert.Equal(installationId, result.InstallationId);
         Assert.Equal(licenseSignature, result.SignatureBytes);
+        Assert.Null(result.Token);
+    }
+
+    [Theory]
+    [BitAutoData]
+    public async Task GetLicenseAsync_WhenFeatureFlagEnabled_CreatesToken(SutProvider<CloudGetOrganizationLicenseQuery> sutProvider,
+        Organization organization, Guid installationId, Installation installation, SubscriptionInfo subInfo,
+        byte[] licenseSignature, string token)
+    {
+        installation.Enabled = true;
+        sutProvider.GetDependency<IInstallationRepository>().GetByIdAsync(installationId).Returns(installation);
+        sutProvider.GetDependency<IPaymentService>().GetSubscriptionAsync(organization).Returns(subInfo);
+        sutProvider.GetDependency<ILicensingService>().SignLicense(Arg.Any<ILicense>()).Returns(licenseSignature);
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.SelfHostLicenseRefactor).Returns(true);
+        sutProvider.GetDependency<ILicensingService>()
+            .CreateOrganizationTokenAsync(organization, installationId, subInfo)
+            .Returns(token);
+
+        var result = await sutProvider.Sut.GetLicenseAsync(organization, installationId);
+
+        Assert.Equal(token, result.Token);
     }
 
     [Theory]