diff --git a/ui/app/templates/components/identity/popup-alias.hbs b/ui/app/templates/components/identity/popup-alias.hbs
index e824513c3..788603a86 100644
--- a/ui/app/templates/components/identity/popup-alias.hbs
+++ b/ui/app/templates/components/identity/popup-alias.hbs
@@ -9,7 +9,7 @@
       </li>
       {{#if item.updatePath.isPending}}
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
diff --git a/ui/app/templates/components/secret-version-menu.hbs b/ui/app/templates/components/secret-version-menu.hbs
index 60e94794b..f501cd433 100644
--- a/ui/app/templates/components/secret-version-menu.hbs
+++ b/ui/app/templates/components/secret-version-menu.hbs
@@ -31,7 +31,7 @@
             {{else}}
               {{#if isFetchingVersionCapabilities}}
                 <li class="action">
-                  <button disabled=true type="button" class="link button is-loading is-transparent">
+                  <button disabled type="button" class="link button is-loading is-transparent">
                     loading
                   </button>
                 </li>
diff --git a/ui/app/templates/partials/role-aws/popup-menu.hbs b/ui/app/templates/partials/role-aws/popup-menu.hbs
index 4bab87a62..4f8fcbca3 100644
--- a/ui/app/templates/partials/role-aws/popup-menu.hbs
+++ b/ui/app/templates/partials/role-aws/popup-menu.hbs
@@ -3,7 +3,7 @@
     <ul class="menu-list">
       {{#if item.generatePath.isPending}}
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
@@ -16,12 +16,12 @@
       {{/if}}
       {{#if item.updatePath.isPending}}
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
diff --git a/ui/app/templates/partials/role-pki/popup-menu.hbs b/ui/app/templates/partials/role-pki/popup-menu.hbs
index 2c54c6c99..a7c68ea41 100644
--- a/ui/app/templates/partials/role-pki/popup-menu.hbs
+++ b/ui/app/templates/partials/role-pki/popup-menu.hbs
@@ -3,7 +3,7 @@
     {{#if (or item.generatePath.isPending item.signPath.isPending)}}
       <ul class="menu-list">
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
@@ -29,12 +29,12 @@
     <ul class="menu-list">
       {{#if item.updatePath.isPending}}
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
diff --git a/ui/app/templates/partials/role-ssh/popup-menu.hbs b/ui/app/templates/partials/role-ssh/popup-menu.hbs
index c878908b7..a234d7e2a 100644
--- a/ui/app/templates/partials/role-ssh/popup-menu.hbs
+++ b/ui/app/templates/partials/role-ssh/popup-menu.hbs
@@ -4,7 +4,7 @@
       {{#if (eq item.keyType 'otp')}}
         {{#if item.generatePath.isPending}}
           <li class="action">
-            <button disabled=true type="button" class="link button is-loading is-transparent">
+            <button disabled type="button" class="link button is-loading is-transparent">
               loading
             </button>
           </li>
@@ -18,7 +18,7 @@
       {{else if (eq item.keyType 'ca')}}
         {{#if item.signPath.isPending}}
           <li class="action">
-            <button disabled=true type="button" class="link button is-loading is-transparent">
+            <button disabled type="button" class="link button is-loading is-transparent">
               loading
             </button>
           </li>
@@ -32,12 +32,12 @@
       {{/if}}
       {{#if item.updatePath.isPending}}
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
         <li class="action">
-          <button disabled=true type="button" class="link button is-loading is-transparent">
+          <button disabled type="button" class="link button is-loading is-transparent">
             loading
           </button>
         </li>
diff --git a/ui/app/templates/partials/secret-list/item.hbs b/ui/app/templates/partials/secret-list/item.hbs
index 0363fe2b5..402d1a7d3 100644
--- a/ui/app/templates/partials/secret-list/item.hbs
+++ b/ui/app/templates/partials/secret-list/item.hbs
@@ -37,7 +37,7 @@
             {{else}}
               {{#if (or item.versionPath.isLoading item.secretPath.isLoading)}}
                 <li class="action">
-                  <button disabled=true type="button" class="link button is-loading is-transparent">
+                  <button disabled type="button" class="link button is-loading is-transparent">
                     loading
                   </button>
                 </li>
diff --git a/ui/app/templates/vault/cluster/access/identity/index.hbs b/ui/app/templates/vault/cluster/access/identity/index.hbs
index f26a06bee..2e85b5f19 100644
--- a/ui/app/templates/vault/cluster/access/identity/index.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/index.hbs
@@ -41,7 +41,7 @@
                 </li>
                 {{#if (or item.isReloading item.updatePath.isPending item.aliasPath.isPending)}}
                   <li class="action">
-                    <button disabled=true type="button" class="link button is-loading is-transparent">
+                    <button disabled type="button" class="link button is-loading is-transparent">
                       loading
                     </button>
                   </li>
diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs
index 8f7498ba6..76293ed28 100644
--- a/ui/app/templates/vault/cluster/policies/index.hbs
+++ b/ui/app/templates/vault/cluster/policies/index.hbs
@@ -90,12 +90,12 @@
                   <ul class="menu-list">
                     {{#if item.updatePath.isPending}}
                       <li class="action">
-                        <button disabled=true type="button" class="link button is-loading is-transparent">
+                        <button disabled type="button" class="link button is-loading is-transparent">
                           loading
                         </button>
                       </li>
                       <li class="action">
-                        <button disabled=true type="button" class="link button is-loading is-transparent">
+                        <button disabled type="button" class="link button is-loading is-transparent">
                           loading
                         </button>
                       </li>
diff --git a/ui/app/templates/vault/cluster/secrets/backends.hbs b/ui/app/templates/vault/cluster/secrets/backends.hbs
index 7dd95621e..6eaf1983a 100644
--- a/ui/app/templates/vault/cluster/secrets/backends.hbs
+++ b/ui/app/templates/vault/cluster/secrets/backends.hbs
@@ -78,7 +78,7 @@
                    {{/unless}}
                  {{#if item.updatePath.isPending}}
                    <li class="action">
-                     <button disabled=true type="button" class="link button is-loading is-transparent"></button>
+                     <button disabled type="button" class="link button is-loading is-transparent"></button>
                     </li>
                  {{/if}}
               </ul>