diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index d4301ae6001..aa5b7274fca 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -397,18 +397,6 @@ export default {
 			}
 		},
 
-		showSelectedVideo(newVal) {
-			if (newVal) {
-				this.$store.dispatch('setCallViewMode', { isGrid: false })
-			}
-		},
-
-		showSelectedScreen(newVal) {
-			if (newVal) {
-				this.$store.dispatch('setCallViewMode', { isGrid: false })
-			}
-		},
-
 		presenterVideoBlockerEnabled(value) {
 			this.showPresenterOverlay = value
 		},
diff --git a/src/components/CallView/Grid/Grid.vue b/src/components/CallView/Grid/Grid.vue
index 31ded7f30d1..184991590d1 100644
--- a/src/components/CallView/Grid/Grid.vue
+++ b/src/components/CallView/Grid/Grid.vue
@@ -78,8 +78,8 @@
 						<LocalVideo v-if="!isStripe && !isRecording && !screenshotMode"
 							ref="localVideo"
 							class="video"
-							:is-grid="true"
-							:fit-video="isStripe"
+							is-grid
+							:fit-video="false"
 							:token="token"
 							:local-media-model="localMediaModel"
 							:local-call-participant-model="localCallParticipantModel"
@@ -801,7 +801,7 @@ export default {
 		},
 
 		handleClickStripeCollapse() {
-			this.$store.dispatch('setCallViewMode', { isStripeOpen: !this.stripeOpen })
+			this.$store.dispatch('setCallViewMode', { isStripeOpen: !this.stripeOpen, clearLast: false })
 		},
 
 		handleMovement() {
diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
index 5bf1df1d043..6918c3af641 100644
--- a/src/store/callViewStore.js
+++ b/src/store/callViewStore.js
@@ -156,17 +156,16 @@ const actions = {
 		if (clearLast) {
 			context.commit('lastIsGrid', null)
 			context.commit('lastIsStripeOpen', null)
-		} else {
-			context.commit('lastIsGrid', context.getters.isGrid)
-			context.commit('lastIsStripeOpen', context.getters.isStripeOpen)
 		}
 
 		if (isGrid !== null) {
+			context.commit('lastIsGrid', context.getters.isGrid)
 			BrowserStorage.setItem('callprefs-' + context.getters.getToken() + '-isgrid', isGrid)
 			context.commit('isGrid', isGrid)
 		}
 
 		if (isStripeOpen !== null) {
+			context.commit('lastIsStripeOpen', context.getters.isStripeOpen)
 			context.commit('isStripeOpen', isStripeOpen)
 		}
 	},