diff --git a/submodules/TelegramCallsUI/Sources/Components/MediaStreamComponent.swift b/submodules/TelegramCallsUI/Sources/Components/MediaStreamComponent.swift
index 2348399df3..9b9c46231f 100644
--- a/submodules/TelegramCallsUI/Sources/Components/MediaStreamComponent.swift
+++ b/submodules/TelegramCallsUI/Sources/Components/MediaStreamComponent.swift
@@ -703,7 +703,7 @@ public final class MediaStreamComponent: CombinedComponent {
                     topInset: environment.statusBarHeight,
                     sideInset: environment.safeInsets.left,
                     leftItem: AnyComponent(Button(
-                        content: AnyComponent(NavigationBackButtonComponent(text: environment.strings.Common_Close, color: .white)),
+                        content: AnyComponent(Text(text: environment.strings.Common_Close, font: Font.regular(17.0), color: .white)),
                         action: { [weak call] in
                             let _ = call?.leave(terminateIfPossible: false)
                         })
diff --git a/submodules/TelegramCallsUI/Sources/Components/MediaStreamVideoComponent.swift b/submodules/TelegramCallsUI/Sources/Components/MediaStreamVideoComponent.swift
index c9eab446c2..407d821acd 100644
--- a/submodules/TelegramCallsUI/Sources/Components/MediaStreamVideoComponent.swift
+++ b/submodules/TelegramCallsUI/Sources/Components/MediaStreamVideoComponent.swift
@@ -44,7 +44,7 @@ final class MediaStreamVideoComponent: Component {
         return State()
     }
     
-    public final class View: UIView, AVPictureInPictureControllerDelegate, AVPictureInPictureSampleBufferPlaybackDelegate, ComponentTaggedView {
+    public final class View: UIView, AVPictureInPictureControllerDelegate, ComponentTaggedView {
         public final class Tag {
         }
         
@@ -103,7 +103,32 @@ final class MediaStreamVideoComponent: Component {
                         self.addSubview(videoView)
                         
                         if #available(iOSApplicationExtension 15.0, iOS 15.0, *), AVPictureInPictureController.isPictureInPictureSupported(), let sampleBufferVideoView = videoView as? SampleBufferVideoRenderingView {
-                            let pictureInPictureController = AVPictureInPictureController(contentSource: AVPictureInPictureController.ContentSource(sampleBufferDisplayLayer: sampleBufferVideoView.sampleBufferLayer, playbackDelegate: self))
+                            final class PlaybackDelegateImpl: NSObject, AVPictureInPictureSampleBufferPlaybackDelegate {
+                                func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, setPlaying playing: Bool) {
+                                    
+                                }
+
+                                func pictureInPictureControllerTimeRangeForPlayback(_ pictureInPictureController: AVPictureInPictureController) -> CMTimeRange {
+                                    return CMTimeRange(start: .zero, duration: .positiveInfinity)
+                                }
+
+                                func pictureInPictureControllerIsPlaybackPaused(_ pictureInPictureController: AVPictureInPictureController) -> Bool {
+                                    return false
+                                }
+
+                                func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, didTransitionToRenderSize newRenderSize: CMVideoDimensions) {
+                                }
+
+                                func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, skipByInterval skipInterval: CMTime, completion completionHandler: @escaping () -> Void) {
+                                    completionHandler()
+                                }
+
+                                public func pictureInPictureControllerShouldProhibitBackgroundAudioPlayback(_ pictureInPictureController: AVPictureInPictureController) -> Bool {
+                                    return false
+                                }
+                            }
+                            
+                            let pictureInPictureController = AVPictureInPictureController(contentSource: AVPictureInPictureController.ContentSource(sampleBufferDisplayLayer: sampleBufferVideoView.sampleBufferLayer, playbackDelegate: PlaybackDelegateImpl()))
                             
                             pictureInPictureController.delegate = self
                             pictureInPictureController.canStartPictureInPictureAutomaticallyFromInline = true
@@ -193,28 +218,6 @@ final class MediaStreamVideoComponent: Component {
             return availableSize
         }
         
-        public func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, setPlaying playing: Bool) {
-        }
-
-        public func pictureInPictureControllerTimeRangeForPlayback(_ pictureInPictureController: AVPictureInPictureController) -> CMTimeRange {
-            return CMTimeRange(start: .zero, duration: .positiveInfinity)
-        }
-
-        public func pictureInPictureControllerIsPlaybackPaused(_ pictureInPictureController: AVPictureInPictureController) -> Bool {
-            return false
-        }
-
-        public func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, didTransitionToRenderSize newRenderSize: CMVideoDimensions) {
-        }
-
-        public func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, skipByInterval skipInterval: CMTime, completion completionHandler: @escaping () -> Void) {
-            completionHandler()
-        }
-
-        public func pictureInPictureControllerShouldProhibitBackgroundAudioPlayback(_ pictureInPictureController: AVPictureInPictureController) -> Bool {
-            return false
-        }
-        
         public func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
             guard let component = self.component else {
                 completionHandler(false)
@@ -226,7 +229,7 @@ final class MediaStreamVideoComponent: Component {
             }
         }
         
-        func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
+        func pictureInPictureControllerDidStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
             self.state?.updated(transition: .immediate)
         }
         
diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
index 7790b00796..584a7806f5 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
@@ -697,6 +697,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     if let strongSelf = self {
                         strongSelf.updateIsAudioSessionActive(false)
                         strongSelf.updateSessionState(internalState: strongSelf.internalState, audioSessionControl: nil)
+                        
+                        if strongSelf.isStream {
+                            let _ = strongSelf.leave(terminateIfPossible: false)
+                        }
                     }
                     subscriber.putCompletion()
                 }
diff --git a/submodules/TgVoipWebrtc/tgcalls b/submodules/TgVoipWebrtc/tgcalls
index d389503ac9..5dfa592544 160000
--- a/submodules/TgVoipWebrtc/tgcalls
+++ b/submodules/TgVoipWebrtc/tgcalls
@@ -1 +1 @@
-Subproject commit d389503ac99d5d6fa16870cc280e83151cba8ccc
+Subproject commit 5dfa5925449e5279ba7e1b0a401b0678dea86dcc