diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index acee075f..d23814b4 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -10,7 +10,7 @@
           class="col"
           color="white"
           style="background-color: grey; height: 30px; padding: 5px"
-          v-if="charge_time_elapsed == 'True'"
+          v-if="timetoComplete < 1"
         >
           <center>Time elapsed</center>
         </div>
@@ -106,7 +106,7 @@
     <q-card class="q-pa-lg" v-if="lnbtc">
       <q-card-section class="q-pa-none">
         <div class="text-center q-pt-md">
-          <div v-if="charge_time_elapsed == 'True' && charge_paid == 'False'">
+          <div v-if="timetoComplete < 1 && charge_paid == 'False'">
             <q-icon
               name="block"
               style="color: #ccc; font-size: 21.4em"
@@ -156,7 +156,7 @@
     <q-card class="q-pa-lg" v-if="onbtc">
       <q-card-section class="q-pa-none">
         <div class="text-center q-pt-md">
-          <div v-if="charge_time_elapsed == 'True' && charge_paid == 'False'">
+          <div v-if="timetoComplete < 1 && charge_paid == 'False'">
             <q-icon
               name="block"
               style="color: #ccc; font-size: 21.4em"
@@ -229,6 +229,7 @@
         newProgress: 0.4,
         counter: 1,
         newTimeLeft: '',
+        timetoComplete: 100,
         lnbtc: true,
         onbtc: false,
         charge_time_elapsed: '{{charge.time_elapsed}}',
@@ -247,7 +248,6 @@
             'filla'
           )
           .then(function (response) {
-            console.log(response.data)
             self.charge_time_elapsed = response.data.time_elapsed
             self.charge_amount = response.data.amount
             self.charge_balance = response.data.balance
@@ -271,6 +271,7 @@
         var timeToComplete =
           parseInt('{{ charge.time }}') * 60 -
           (Date.now() / 1000 - parseInt('{{ charge.timestamp }}'))
+        this.timetoComplete = timeToComplete
         var timeLeft = Quasar.utils.date.formatDate(
           new Date((timeToComplete - 3600) * 1000),
           'HH:mm:ss'
@@ -288,8 +289,7 @@
       timerCount: function () {
         self = this
         var refreshIntervalId = setInterval(function () {
-          if (self.charge_paid == 'True') {
-            console.log('did this work?')
+          if (self.charge_paid == 'True' || self.timetoComplete < 1) {
             clearInterval(refreshIntervalId)
           }
           self.getTheTime()