diff --git a/src/components/SubscriptionsList.vue b/src/components/SubscriptionsList.vue
index 28ea86e75..71270be42 100644
--- a/src/components/SubscriptionsList.vue
+++ b/src/components/SubscriptionsList.vue
@@ -449,6 +449,7 @@ export default class SubscriptionsList extends Vue {
         if (error) {
           this.$emit('onSubError', error.toString(), `Topics: ${JSON.stringify(topicsArr)}`)
           this.$log.error(`Error subscribing to topic: ${error}`)
+          isFinished = true
           return false
         }
         const successSubscriptions: string[] = []
@@ -466,6 +467,7 @@ export default class SubscriptionsList extends Vue {
           })
         }
         if (!successSubscriptions.length) {
+          isFinished = true
           return false
         }
         if (enable) {
diff --git a/web/src/components/SubscriptionsList.vue b/web/src/components/SubscriptionsList.vue
index d52067c67..12dac7190 100644
--- a/web/src/components/SubscriptionsList.vue
+++ b/web/src/components/SubscriptionsList.vue
@@ -405,6 +405,7 @@ export default class SubscriptionsList extends Vue {
         this.subLoading = false
         if (error) {
           this.$message.error(error)
+          isFinished = true
           return false
         }
         const successSubscriptions: string[] = []
@@ -418,6 +419,7 @@ export default class SubscriptionsList extends Vue {
           }
         })
         if (!successSubscriptions.length) {
+          isFinished = true
           return false
         }
         if (enable) {