diff --git a/static/js/directives/ui/billing-management-panel.js b/static/js/directives/ui/billing-management-panel.js
index e3d3e31f8..5cb93db91 100644
--- a/static/js/directives/ui/billing-management-panel.js
+++ b/static/js/directives/ui/billing-management-panel.js
@@ -13,7 +13,7 @@ angular.module('quay').directive('billingManagementPanel', function () {
       'organization': '=organization',
       'isEnabled': '=isEnabled'
     },
-    controller: function($scope, $element, PlanService, ApiService) {
+    controller: function($scope, $element, PlanService, ApiService, Features) {
       $scope.currentCard = null;
       $scope.subscription = null;
       $scope.updating = true;
@@ -41,7 +41,7 @@ angular.module('quay').directive('billingManagementPanel', function () {
       };
 
       var update = function() {
-        if (!$scope.isEnabled || !($scope.user || $scope.organization)) {
+        if (!$scope.isEnabled || !($scope.user || $scope.organization) || !Features.BILLING) {
           return;
         }
 
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index d7adc8ac3..d880c0630 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -119,7 +119,7 @@
             </div>
 
             <!-- Billing Information -->
-            <div class="settings-section">
+            <div class="settings-section" quay-show="Features.BILLING">
               <h3>Billing Information</h3>
               <div class="billing-management-panel" organization="organization" is-enabled="showBillingCounter"></div>
             </div>
diff --git a/static/partials/user-view.html b/static/partials/user-view.html
index ba6fff05a..8487098eb 100644
--- a/static/partials/user-view.html
+++ b/static/partials/user-view.html
@@ -131,7 +131,7 @@
           </div>
 
           <!-- Billing Information -->
-          <div class="settings-section">
+          <div class="settings-section" quay-show="Features.BILLING">
             <h3>Billing Information</h3>
             <div class="billing-management-panel" user="context.viewuser" is-enabled="showBillingCounter"></div>
           </div>