diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs
index addd4cad0c..1b35b468a1 100644
--- a/src/Api/Controllers/AccountsController.cs
+++ b/src/Api/Controllers/AccountsController.cs
@@ -419,11 +419,15 @@ namespace Bit.Api.Controllers
                 var license = await _userService.GenerateLicenseAsync(user, billingInfo);
                 return new BillingResponseModel(user, billingInfo, license);
             }
-            else
+            else if(!_globalSettings.SelfHosted)
             {
                 var license = await _userService.GenerateLicenseAsync(user);
                 return new BillingResponseModel(user, license);
             }
+            else
+            {
+                return new BillingResponseModel(user);
+            }
         }
 
         [HttpPost("payment")]
diff --git a/src/Core/Models/Api/Response/BillingResponseModel.cs b/src/Core/Models/Api/Response/BillingResponseModel.cs
index 2d0d340511..1a3e01225f 100644
--- a/src/Core/Models/Api/Response/BillingResponseModel.cs
+++ b/src/Core/Models/Api/Response/BillingResponseModel.cs
@@ -23,14 +23,18 @@ namespace Bit.Core.Models.Api
             Expiration = License.Expires;
         }
 
-        public BillingResponseModel(User user, UserLicense license)
+        public BillingResponseModel(User user, UserLicense license = null)
             : base("billing")
         {
             StorageName = user.Storage.HasValue ? Utilities.CoreHelpers.ReadableBytesSize(user.Storage.Value) : null;
             StorageGb = user.Storage.HasValue ? Math.Round(user.Storage.Value / 1073741824D, 2) : 0; // 1 GB
             MaxStorageGb = user.MaxStorageGb;
-            License = license;
             Expiration = user.PremiumExpirationDate;
+
+            if(license != null)
+            {
+                License = license;
+            }
         }
 
         public string StorageName { get; set; }