diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 99479c23..ae56f6d4 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -65,16 +65,16 @@
               class="q-mr-md gt-md"
             >
             </q-badge>
-            {%endif%} {% if LNBITS_CUSTOM_BADGE is defined %}
+            {%endif%} {% if LNBITS_CUSTOM_BADGE is not none and
+            LNBITS_CUSTOM_BADGE != "" %}
             <q-badge
-              v-if="`{{LNBITS_CUSTOM_BADGE}}`.length > 0"
               v-show="$q.screen.gt.sm"
               color="{{ LNBITS_CUSTOM_BADGE_COLOR }}"
               class="q-mr-md"
               label="{{LNBITS_CUSTOM_BADGE|e}}"
             >
             </q-badge>
-            {%endif%} {% if LNBITS_SERVICE_FEE > 0 %}
+            {% endif %} {% if LNBITS_SERVICE_FEE > 0 %}
             <q-badge
               v-show="$q.screen.gt.sm"
               v-if="g.user"