diff --git a/app/scripts/directives/oscPersistentVolumeClaim.js b/app/scripts/directives/oscPersistentVolumeClaim.js
index 2808a4c526..5728fed0f6 100644
--- a/app/scripts/directives/oscPersistentVolumeClaim.js
+++ b/app/scripts/directives/oscPersistentVolumeClaim.js
@@ -84,6 +84,10 @@ angular.module("openshiftConsole")
 
         DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClassData) {
            var storageClasses = storageClassData.by('metadata.name');
+           if (_.isEmpty(storageClasses)) {
+             return;
+           }
+
            scope.storageClasses = _.sortBy(storageClasses, 'metadata.name');
            var annotation = $filter('annotation');
            scope.defaultStorageClass = _.find(scope.storageClasses, function(storageClass) {
diff --git a/app/views/directives/osc-persistent-volume-claim.html b/app/views/directives/osc-persistent-volume-claim.html
index fc39a31d66..66092f0afe 100644
--- a/app/views/directives/osc-persistent-volume-claim.html
+++ b/app/views/directives/osc-persistent-volume-claim.html
@@ -1,11 +1,10 @@
 <ng-form name="persistentVolumeClaimForm">
   <fieldset ng-disabled="claimDisabled">
-    <div ng-show="storageClasses | hashSize" class="form-group">
+    <div ng-if="storageClasses.length" class="form-group">
       <!--storage class-->
       <label>Storage Class</label>
       <div>
         <ui-select
-          ng-if="storageClasses"
           ng-model="claim.storageClass"
           theme="bootstrap"
           search-enabled="true"
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index fa7253b2bd..5545d838f0 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -10262,6 +10262,7 @@ group:"storage.k8s.io",
 resource:"storageclasses"
 }, {}, function(b) {
 var c = b.by("metadata.name");
+if (!_.isEmpty(c)) {
 e.storageClasses = _.sortBy(c, "metadata.name");
 var d = a("annotation");
 if (e.defaultStorageClass = _.find(e.storageClasses, function(a) {
@@ -10278,6 +10279,7 @@ description:"No storage class will be assigned"
 };
 e.storageClasses.unshift(f);
 }
+}
 }, {
 errorNotification:!1
 }), b.list("limitranges", {
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index be016ad75c..8912f2107e 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -7791,11 +7791,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   $templateCache.put('views/directives/osc-persistent-volume-claim.html',
     "<ng-form name=\"persistentVolumeClaimForm\">\n" +
     "<fieldset ng-disabled=\"claimDisabled\">\n" +
-    "<div ng-show=\"storageClasses | hashSize\" class=\"form-group\">\n" +
+    "<div ng-if=\"storageClasses.length\" class=\"form-group\">\n" +
     "\n" +
     "<label>Storage Class</label>\n" +
     "<div>\n" +
-    "<ui-select ng-if=\"storageClasses\" ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
+    "<ui-select ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
     "<ui-select-match placeholder=\"Select a storage class\">\n" +
     "<span>\n" +
     "{{$select.selected.metadata.name}}\n" +