diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
index 0edab0daf25d..543030a453df 100644
--- a/src/components/CallView/shared/VideoBottomBar.vue
+++ b/src/components/CallView/shared/VideoBottomBar.vue
@@ -273,7 +273,7 @@ export default {
 		},
 
 		switchToScreen() {
-			if (!this.sharedData.screenVisible) {
+			if (!this.sharedData.screenVisible || !this.isBig) {
 				emit('switch-screen-to-id', this.model.attributes.peerId)
 			}
 		},
diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
index 783023bd94eb..08f0dd533305 100644
--- a/src/store/callViewStore.js
+++ b/src/store/callViewStore.js
@@ -208,7 +208,12 @@ const actions = {
 	startPresentation(context) {
 		// don't start twice, this would prevent multiple
 		// screen shares to clear the last call view state
+		// only switch to Speaker view and hide Stripe
 		if (context.getters.presentationStarted) {
+			context.dispatch('setCallViewMode', {
+				isGrid: false,
+				isStripeOpen: false,
+			})
 			return
 		}