diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
index 8dcf45af1b0..aa933f05f30 100644
--- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
@@ -331,9 +331,9 @@
         return this.$router.push({ query: newQuery });
       },
       handleSubmitToken({ token, channels }) {
+        this.showTokenModal = false;
         if (channels.length > 1) {
           if (this.$route.query.token !== token) {
-            this.disableModal = true;
             this.$router.push({
               ...this.$route,
               query: {
@@ -341,8 +341,6 @@
                 token,
               },
             });
-          } else {
-            this.showTokenModal = false;
           }
         } else {
           this.goToSelectContentPageForChannel(channels[0]);