diff --git a/src/component/internal/connection.ts b/src/component/internal/connection.ts
index cb641f4d..bbda1164 100644
--- a/src/component/internal/connection.ts
+++ b/src/component/internal/connection.ts
@@ -101,9 +101,6 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
       state.webrtc.config,
     )
 
-    // initial state
-    Vue.set(this._state, 'type', 'screencast')
-
     // websocket
     this._websocket_reconn.on('connect', () => {
       if (this.websocket.connected && this.webrtc.connected) {
@@ -136,7 +133,7 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
         Vue.set(this._state, 'status', 'connecting')
       }
 
-      Vue.set(this._state, 'type', 'screencast')
+      Vue.set(this._state, 'type', 'fallback')
     })
     this._webrtc_reconn.on('close', (error) => {
       this.disconnect(error)
@@ -157,10 +154,18 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
 
       // check if video is not playing smoothly
       if (stats.fps && stats.packetLoss < WEBRTC_RECONN_MAX_LOSS && !stats.muted) {
+        if (this._state.type === 'fallback') {
+          Vue.set(this._state, 'type', 'webrtc')
+        }
+
         webrtcCongestion = 0
         return
       }
 
+      if (this._state.type === 'webrtc') {
+        Vue.set(this._state, 'type', 'fallback')
+      }
+
       // try to downgrade quality if it happend many times
       if (++webrtcCongestion >= WEBRTC_RECONN_FAILED_ATTEMPTS) {
         webrtcCongestion = 0
@@ -205,7 +210,9 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
       Vue.set(this._state.webrtc, 'video', video)
     }
 
+    Vue.set(this._state, 'type', 'fallback')
     Vue.set(this._state, 'status', 'connecting')
+
     this._webrtc_reconn.open(true)
     this._websocket_reconn.open()
   }
@@ -214,7 +221,9 @@ export class NekoConnection extends EventEmitter<NekoConnectionEvents> {
     this._websocket_reconn.close()
     this._webrtc_reconn.close()
 
+    Vue.set(this._state, 'type', 'none')
     Vue.set(this._state, 'status', 'disconnected')
+
     this.emit('disconnect', error)
   }
 
diff --git a/src/component/main.vue b/src/component/main.vue
index a45a1707..b7afa6aa 100644
--- a/src/component/main.vue
+++ b/src/component/main.vue
@@ -1,14 +1,8 @@
 <template>
   <div ref="component" class="neko-component">
     <div ref="container" class="neko-container">
-      <video
-        v-show="state.connection.type == 'webrtc'"
-        ref="video"
-        :autoplay="autoplay"
-        :muted="autoplay"
-        playsinline
-      />
-      <neko-screencast v-if="state.connection.type == 'screencast' && state.connection.screencast" :api="api.room" />
+      <video v-show="!screencast" ref="video" :autoplay="autoplay" :muted="autoplay" playsinline />
+      <neko-screencast v-show="screencast" :enabled="screencast" :api="api.room" />
       <neko-overlay
         :webrtc="connection.webrtc"
         :scroll="state.control.scroll"
@@ -182,6 +176,10 @@
       return this.state.session_id != null ? this.state.sessions[this.state.session_id].profile.is_admin : false
     }
 
+    public get screencast() {
+      return this.state.connection.type == 'fallback' && this.state.connection.screencast
+    }
+
     /////////////////////////////
     // Public events
     /////////////////////////////
diff --git a/src/component/screencast.vue b/src/component/screencast.vue
index 57187ca5..f1c5b147 100644
--- a/src/component/screencast.vue
+++ b/src/component/screencast.vue
@@ -15,6 +15,9 @@
     @Ref('image') readonly _image!: HTMLImageElement
     active = false
 
+    @Prop()
+    private readonly enabled!: boolean
+
     @Prop()
     private readonly api!: RoomApi
 
@@ -36,18 +39,37 @@
       }
     }
 
-    async mounted() {
+    mounted() {
+      if (this.enabled) {
+        this.start()
+      }
+    }
+
+    beforeDestroy() {
+      this.stop()
+    }
+
+    start() {
       this.active = true
 
       setTimeout(this.loop, 0)
     }
 
-    beforeDestroy() {
+    stop() {
       this.active = false
 
-      if (this._image.src) {
+      if (this._image && this._image.src) {
         URL.revokeObjectURL(this._image.src)
       }
     }
+
+    @Watch('enabled')
+    onEnabledChanged(enabled: boolean) {
+      if (enabled) {
+        this.start()
+      } else {
+        this.stop()
+      }
+    }
   }
 </script>
diff --git a/src/component/types/state.ts b/src/component/types/state.ts
index fd8d6be6..3418fc71 100644
--- a/src/component/types/state.ts
+++ b/src/component/types/state.ts
@@ -22,7 +22,7 @@ export interface Connection {
   websocket: WebSocket
   webrtc: WebRTC
   screencast: boolean
-  type: 'webrtc' | 'screencast' | 'none'
+  type: 'webrtc' | 'fallback' | 'none'
 }
 
 export interface WebSocket {