diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 2af1015e7f9..8a8ed51db0d 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -197,15 +197,15 @@ export default {
 		},
 	},
 
-	setup() {
+	setup(props) {
 		// For debug and screenshot purposes. Set to true to enable
 		const devMode = ref(false)
 		provide('CallView:devModeEnabled', devMode)
 		const screenshotMode = ref(false)
 		provide('CallView:screenshotModeEnabled', screenshotMode)
 		const settingsStore = useSettingsStore()
-		const startWithoutMediaEnabled = settingsStore.startWithoutMedia
-		if (startWithoutMediaEnabled) {
+		// If media settings was not used, we check the global config of default devices state here
+		if (!settingsStore.getShowMediaSettings(props.token) && settingsStore.startWithoutMedia) {
 			localMediaModel.disableAudio()
 			localMediaModel.disableVideo()
 		}
diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
index f0f981279e0..989e05b5138 100644
--- a/src/components/MediaSettings/MediaSettings.vue
+++ b/src/components/MediaSettings/MediaSettings.vue
@@ -438,8 +438,17 @@ export default {
 	watch: {
 		modal(newValue) {
 			if (newValue) {
-				this.audioOn = !BrowserStorage.getItem('audioDisabled_' + this.token)
-				this.videoOn = !BrowserStorage.getItem('videoDisabled_' + this.token)
+				if (this.settingsStore.startWithoutMedia) {
+					// Disable audio
+					this.audioOn = false
+					BrowserStorage.setItem('audioDisabled_' + this.token, 'true')
+					// Disable video
+					this.videoOn = false
+					BrowserStorage.setItem('videoDisabled_' + this.token, 'true')
+				} else {
+					this.audioOn = !BrowserStorage.getItem('audioDisabled_' + this.token)
+					this.videoOn = !BrowserStorage.getItem('videoDisabled_' + this.token)
+				}
 				this.silentCall = !!BrowserStorage.getItem('silentCall_' + this.token)
 
 				// Set virtual background depending on BrowserStorage's settings