diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
index 04f2a48ab5..d679508cb2 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
@@ -738,6 +738,7 @@ module.controller('ClientListCtrl', function($scope, realm, Client, serverInfo,
     $scope.currentPageInput = 1;
     $scope.numberOfPages = 1;
     $scope.pageSize = 20;
+    $scope.clientStorageProviders = serverInfo.componentTypes['org.keycloak.storage.client.ClientStorageProvider'];
     
     Client.query({realm: realm.realm, viewableOnly: true}).$promise.then(function(clients) {
         $scope.numberOfPages = Math.ceil(clients.length/$scope.pageSize);
@@ -2393,6 +2394,7 @@ module.controller('ClientStoresCtrl', function($scope, $location, $route, realm,
     console.log('ClientStoresCtrl ++++****');
     $scope.realm = realm;
     $scope.providers = serverInfo.componentTypes['org.keycloak.storage.client.ClientStorageProvider'];
+    $scope.clientStorageProviders = serverInfo.componentTypes['org.keycloak.storage.client.ClientStorageProvider'];
     $scope.instancesLoaded = false;
 
     if (!$scope.providers) $scope.providers = [];
diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-clients.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-clients.html
index cf5a332221..8cf318a8f1 100755
--- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-clients.html
+++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-clients.html
@@ -8,7 +8,7 @@
             <a href="#/realms/{{realm.realm}}/clients">{{:: 'lookup' | translate}}</a>
             <kc-tooltip>{{:: 'clients.tooltip' | translate}}</kc-tooltip>
         </li>
-        <li ng-class="{active: path[2] == 'client-stores'}">
+        <li ng-class="{active: path[2] == 'client-stores'}" data-ng-hide="!clientStorageProviders || clientStorageProviders.length == 0">
             <a href="#/realms/{{realm.realm}}/client-stores">{{:: 'client-storage' | translate}}</a>
             <kc-tooltip>{{:: 'client-stores.tooltip' | translate}}</kc-tooltip>
         </li>