diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index 3fdf983c16..e176102b82 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -651,7 +651,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     private fun startScreenSharing(activityResult: ActivityResult) {
         val videoCapturer = ScreenCapturerAndroid(activityResult.data, object : MediaProjection.Callback() {
             override fun onStop() {
-                Timber.v("User revoked the screen capturing permission")
+                Timber.i("User revoked the screen capturing permission")
             }
         })
         callViewModel.handle(VectorCallViewActions.StartScreenSharing(videoCapturer))
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 0b9f9a665e..ad57119442 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -783,31 +783,43 @@ class WebRtcCall(
         val localMediaStream = factory.createLocalMediaStream(STREAM_ID)
         val videoSource = factory.createVideoSource(videoCapturer.isScreencast)
 
-        // Start capturing screen
-        val surfaceTextureHelper = SurfaceTextureHelper.create("CaptureThread", rootEglBase!!.eglBaseContext)
-        videoCapturer.initialize(surfaceTextureHelper, context, videoSource.capturerObserver)
-        videoCapturer.startCapture(currentCaptureFormat.width, currentCaptureFormat.height, currentCaptureFormat.fps)
+        startCapturingScreen(videoCapturer, videoSource)
 
-        // Remove local camera previews
-        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.removeSink(it) } }
+        removeLocalSurfaceRenderers()
 
-        // Show screen preview locally
-        localVideoTrack = factory.createVideoTrack(VIDEO_TRACK_ID, videoSource).apply { setEnabled(true) }
-        localMediaStream?.addTrack(localVideoTrack)
-        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.addSink(it) } }
+        showScreenLocally(factory, videoSource, localMediaStream)
 
-        // Remove camera stream
-        peerConnection?.removeTrack(videoSender)
+        videoSender?.let { removeStream(it) }
 
         screenSender = peerConnection?.addTrack(localVideoTrack, listOf(STREAM_ID))
     }
 
     fun stopSharingScreen() {
-        screenSender?.let { peerConnection?.removeTrack(it) }
+        screenSender?.let { removeStream(it) }
         peerConnectionFactoryProvider.get()?.let { configureVideoTrack(it) }
         sessionScope?.launch(dispatcher) { attachViewRenderersInternal() }
     }
 
+    private fun removeStream(sender: RtpSender) {
+        peerConnection?.removeTrack(sender)
+    }
+
+    private fun showScreenLocally(factory: PeerConnectionFactory, videoSource: VideoSource?, localMediaStream: MediaStream?) {
+        localVideoTrack = factory.createVideoTrack(VIDEO_TRACK_ID, videoSource).apply { setEnabled(true) }
+        localMediaStream?.addTrack(localVideoTrack)
+        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.addSink(it) } }
+    }
+
+    private fun removeLocalSurfaceRenderers() {
+        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.removeSink(it) } }
+    }
+
+    private fun startCapturingScreen(videoCapturer: VideoCapturer, videoSource: VideoSource) {
+        val surfaceTextureHelper = SurfaceTextureHelper.create("CaptureThread", rootEglBase!!.eglBaseContext)
+        videoCapturer.initialize(surfaceTextureHelper, context, videoSource.capturerObserver)
+        videoCapturer.startCapture(currentCaptureFormat.width, currentCaptureFormat.height, currentCaptureFormat.fps)
+    }
+
     private suspend fun release() {
         listeners.clear()
         mxCall.removeListener(this)