diff --git a/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift b/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
index af8978c30..61a437e02 100644
--- a/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
+++ b/Mastodon/Scene/Share/ViewModel/VideoPlayerViewModel.swift
@@ -113,6 +113,7 @@ final class VideoPlayerViewModel {
             .sink { [weak self] status in
                 os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: %s status: %s", ((#file as NSString).lastPathComponent), #line, #function, sessionName, status.description)
                 guard let self = self else { return }
+                
                 // only update audio session for video
                 guard self.videoKind == .video else { return }
                 switch status {
@@ -122,7 +123,7 @@ final class VideoPlayerViewModel {
                     try? AVAudioSession.sharedInstance().setCategory(.playback)
                     try? AVAudioSession.sharedInstance().setActive(true)
                 case .paused, .stopped, .failed:
-                    try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)  // reset to default
+                    try? AVAudioSession.sharedInstance().setCategory(.ambient)  // set to ambient to allow mixed (needed for GIFV)
                     try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
                 }
             }
@@ -149,14 +150,6 @@ extension VideoPlayerViewModel {
     }
     
     func play() {
-        switch videoKind {
-        case .gif:
-            break
-        case .video:
-            break
-//            try? AVAudioSession.sharedInstance().setCategory(.soloAmbient, mode: .default)
-        }
-
         player.play()
         updateDate = Date()
     }
diff --git a/Mastodon/Service/AudioPlaybackService.swift b/Mastodon/Service/AudioPlaybackService.swift
index 5abb30c6c..42d3edf7d 100644
--- a/Mastodon/Service/AudioPlaybackService.swift
+++ b/Mastodon/Service/AudioPlaybackService.swift
@@ -42,7 +42,7 @@ final class AudioPlaybackService: NSObject {
                     try? AVAudioSession.sharedInstance().setCategory(.playback)
                     try? AVAudioSession.sharedInstance().setActive(true)
                 case .paused, .stopped, .failed:
-                    try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)  // reset to default
+                    try? AVAudioSession.sharedInstance().setCategory(.ambient)  // set to ambient to allow mixed (needed for GIFV)
                     try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
                 }
             }