diff --git a/app/views/browse/secret.html b/app/views/browse/secret.html
index e0176b3443..f7a8a5f85e 100644
--- a/app/views/browse/secret.html
+++ b/app/views/browse/secret.html
@@ -61,7 +61,7 @@ <h1 class="contains-actions">
           <div class="resource-details">
             <h2 class="mar-top-none">
               {{secret.type}}
-              <small class="mar-left-sm"><a href="" ng-click="view.showSecret = !view.showSecret">{{view.showSecret ? "Hide" : "Reveal"}} Secret</a></small>
+              <small class="mar-left-sm"><a href="" ng-if="secret.data" ng-click="view.showSecret = !view.showSecret">{{view.showSecret ? "Hide" : "Reveal"}} Secret</a></small>
             </h2>
             <dl class="secret-data left">
               <div ng-repeat="(secretDataName, secretData) in decodedSecretData" class="image-source-item">
@@ -90,6 +90,9 @@ <h2 class="mar-top-none">
                 </div>
               </div>
             </dl>
+            <p ng-if="!secret.data" class="mar-bottom-xl">
+              There are no data in this secret.
+            </p>
             <annotations annotations="secret.metadata.annotations"></annotations>
           </div>
         </div><!-- /col-* -->
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index bdaa0c136e..d0aa68dc2a 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -3611,7 +3611,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"resource-details\">\n" +
     "<h2 class=\"mar-top-none\">\n" +
     "{{secret.type}}\n" +
-    "<small class=\"mar-left-sm\"><a href=\"\" ng-click=\"view.showSecret = !view.showSecret\">{{view.showSecret ? \"Hide\" : \"Reveal\"}} Secret</a></small>\n" +
+    "<small class=\"mar-left-sm\"><a href=\"\" ng-if=\"secret.data\" ng-click=\"view.showSecret = !view.showSecret\">{{view.showSecret ? \"Hide\" : \"Reveal\"}} Secret</a></small>\n" +
     "</h2>\n" +
     "<dl class=\"secret-data left\">\n" +
     "<div ng-repeat=\"(secretDataName, secretData) in decodedSecretData\" class=\"image-source-item\">\n" +
@@ -3636,6 +3636,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</dl>\n" +
+    "<p ng-if=\"!secret.data\" class=\"mar-bottom-xl\">\n" +
+    "There are no data in this secret.\n" +
+    "</p>\n" +
     "<annotations annotations=\"secret.metadata.annotations\"></annotations>\n" +
     "</div>\n" +
     "</div>\n" +