diff --git a/LegacyComponents/TGMediaAssetsController.m b/LegacyComponents/TGMediaAssetsController.m
index 314a8e8414..5dfc342e77 100644
--- a/LegacyComponents/TGMediaAssetsController.m
+++ b/LegacyComponents/TGMediaAssetsController.m
@@ -878,6 +878,9 @@
 {
     if (_intent == TGMediaAssetsControllerSendFileIntent)
         return nil;
+    if (self.requestSearchController == nil) {
+        return nil;
+    }
     
     if (iosMajorVersion() < 7)
     {
diff --git a/LegacyComponents/TGVideoMessageCaptureController.m b/LegacyComponents/TGVideoMessageCaptureController.m
index 89d1c93905..46714a0095 100644
--- a/LegacyComponents/TGVideoMessageCaptureController.m
+++ b/LegacyComponents/TGVideoMessageCaptureController.m
@@ -193,6 +193,10 @@ typedef enum
     [_thumbnailsDisposable dispose];
     [[NSNotificationCenter defaultCenter] removeObserver:_didEnterBackgroundObserver];
     [_activityDisposable dispose];
+    id<SDisposable> currentAudioSession = _currentAudioSession;
+    [_queue dispatch:^{
+         [currentAudioSession dispose];
+    }];
 }
 
 + (NSURL *)tempOutputPath