diff --git a/src/Squidex.Read/Apps/Services/IAppPlanBillingManager.cs b/src/Squidex.Read/Apps/Services/IAppPlanBillingManager.cs
index d5cdb3001..29a57b20b 100644
--- a/src/Squidex.Read/Apps/Services/IAppPlanBillingManager.cs
+++ b/src/Squidex.Read/Apps/Services/IAppPlanBillingManager.cs
@@ -15,8 +15,6 @@ namespace Squidex.Read.Apps.Services
     {
         bool HasPortal { get; }
 
-        string FreePlanId { get; }
-
         Task ChangePlanAsync(string userId, Guid appId, string appName, string planId);
 
         Task<bool> HasPaymentOptionsAsync(string userId);
diff --git a/src/Squidex.Read/Apps/Services/Implementations/NoopAppPlanBillingManager.cs b/src/Squidex.Read/Apps/Services/Implementations/NoopAppPlanBillingManager.cs
index a8fd74136..edf22e189 100644
--- a/src/Squidex.Read/Apps/Services/Implementations/NoopAppPlanBillingManager.cs
+++ b/src/Squidex.Read/Apps/Services/Implementations/NoopAppPlanBillingManager.cs
@@ -19,11 +19,6 @@ namespace Squidex.Read.Apps.Services.Implementations
             get { return false; }
         }
 
-        public string FreePlanId
-        {
-            get { return "infinite"; }
-        }
-
         public Task ChangePlanAsync(string userId, Guid appId, string appName, string planId)
         {
             return TaskHelper.Done;
diff --git a/src/Squidex/Controllers/Api/Plans/AppPlansController.cs b/src/Squidex/Controllers/Api/Plans/AppPlansController.cs
index 9f79b798a..be5722371 100644
--- a/src/Squidex/Controllers/Api/Plans/AppPlansController.cs
+++ b/src/Squidex/Controllers/Api/Plans/AppPlansController.cs
@@ -56,13 +56,15 @@ namespace Squidex.Controllers.Api.Plans
         {
             var userId = User.FindFirst(OpenIdClaims.Subject).Value;
 
+            var planId = appPlansProvider.GetPlanForApp(App).Id;
+
             var response = new AppPlansDto
             {
                 Plans = appPlansProvider.GetAvailablePlans().Select(x => SimpleMapper.Map(x, new PlanDto())).ToList(),
                 PlanOwner = App.PlanOwner,
                 HasPortal = appPlansBillingManager.HasPortal,
                 HasConfigured = await appPlansBillingManager.HasPaymentOptionsAsync(userId),
-                CurrentPlanId = !string.IsNullOrWhiteSpace(App.PlanId) ? App.PlanId : appPlansBillingManager.FreePlanId
+                CurrentPlanId = planId
             };
 
             Response.Headers["ETag"] = new StringValues(App.Version.ToString());
diff --git a/tests/Squidex.Read.Tests/Apps/NoopAppPlanBillingManagerTests.cs b/tests/Squidex.Read.Tests/Apps/NoopAppPlanBillingManagerTests.cs
index 5c341e4f0..9080f03d4 100644
--- a/tests/Squidex.Read.Tests/Apps/NoopAppPlanBillingManagerTests.cs
+++ b/tests/Squidex.Read.Tests/Apps/NoopAppPlanBillingManagerTests.cs
@@ -23,12 +23,6 @@ namespace Squidex.Read.Apps
             Assert.False(sut.HasPortal);
         }
 
-        [Fact]
-        public void Should_provide_free_plan()
-        {
-            Assert.Equal("infinite", sut.FreePlanId);
-        }
-
         [Fact]
         public async Task Should_do_nothing_when_changing_plan()
         {