diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 7d4948c72ee..fee47282252 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -105,7 +105,7 @@
 				@click-local-video="handleClickLocalVideo" />
 			<!-- Local video if the conversation is 1to1 or if sidebar -->
 			<LocalVideo
-				v-if="isOneToOneView"
+				v-if="isOneToOneView && !showLocalVideo"
 				ref="localVideo"
 				class="local-video"
 				:class="{ 'local-video--sidebar': isSidebar }"
@@ -115,7 +115,8 @@
 				:video-container-aspect-ratio="videoContainerAspectRatio"
 				:local-call-participant-model="localCallParticipantModel"
 				:is-sidebar="isSidebar"
-				@switchScreenToId="1" />
+				@switchScreenToId="1"
+				@click-video="handleClickLocalVideo" />
 		</div>
 	</div>
 </template>
@@ -494,6 +495,10 @@ export default {
 			this.isLocalVideoSelected = false
 		},
 		handleClickLocalVideo() {
+			// DO nothing if no video
+			if (!this.hasLocalVideo) {
+				return
+			}
 			// Deselect possible selected video
 			this.$store.dispatch('selectedVideoPeerId', 'local')
 			this.$store.dispatch('isGrid', false)