diff --git a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
index 9fa1c47..850183a 100644
--- a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
+++ b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
@@ -1840,9 +1840,13 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
     
     @objc func dismissTapped() {
         if let presentingViewController = self.presentingViewController {
-            presentingViewController.dismiss(animated: true, completion: nil)
+            presentingViewController.dismiss(animated: true) { [weak self] in
+                self?.detachedWindow = nil
+            }
         } else {
-            dismiss(animated: true, completion: nil)
+            dismiss(animated: true) { [weak self] in
+                self?.detachedWindow = nil
+            }
         }
     }