diff --git a/lnbits/core/static/js/wallet.js b/lnbits/core/static/js/wallet.js
index f872ad090..29a1025da 100644
--- a/lnbits/core/static/js/wallet.js
+++ b/lnbits/core/static/js/wallet.js
@@ -691,10 +691,7 @@ new Vue({
   },
   mounted: function () {
     // show disclaimer
-    if (
-      this.$refs.disclaimer &&
-      !this.$q.localStorage.getItem('lnbits.disclaimerShown')
-    ) {
+    if (!this.$q.localStorage.getItem('lnbits.disclaimerShown')) {
       this.disclaimerDialog.show = true
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index e9c6e496a..9453e1bf7 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -706,8 +706,7 @@
 
     <q-tab icon="photo_camera" label="Scan" @click="showCamera"> </q-tab>
   </q-tabs>
-  {% if service_fee > 0 %}
-  <div ref="disclaimer"></div>
+
   <q-dialog v-model="disclaimerDialog.show">
     <q-card class="q-pa-lg">
       <h6 class="q-my-md text-deep-purple">Warning</h6>
@@ -720,10 +719,10 @@
       </p>
       <p>
         This service is in BETA, and we hold no responsibility for people losing
-        access to funds. To encourage you to run your own LNbits installation,
-        any balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %}
-        will incur a charge of
-        <strong>{{ service_fee }}% service fee</strong> per week.
+        access to funds. {% if service_fee > 0 %} To encourage you to run your
+        own LNbits installation, any balance on {% raw %}{{
+        disclaimerDialog.location.host }}{% endraw %} will incur a charge of
+        <strong>{{ service_fee }}% service fee</strong> per week. {% endif %}
       </p>
       <div class="row q-mt-lg">
         <q-btn
@@ -738,5 +737,5 @@
       </div>
     </q-card>
   </q-dialog>
-  {% endif %} {% endblock %}
+  {% endblock %}
 </div>