diff --git a/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift b/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift
index 7a9f386f..62115ad3 100644
--- a/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift
+++ b/Yep/ViewControllers/MessageMedia/MessageMediaViewController.swift
@@ -17,6 +17,9 @@ class MessageMediaViewController: UIViewController {
 
     @IBOutlet weak var mediaControlView: MediaControlView!
 
+    deinit {
+        NSNotificationCenter.defaultCenter().removeObserver(self)
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -60,6 +63,8 @@ class MessageMediaViewController: UIViewController {
                             self.mediaControlView.timeLabel.text = "\(coundDownTime)"
                         })
 
+                        NSNotificationCenter.defaultCenter().addObserver(self, selector: "playerItemDidReachEnd:", name: AVPlayerItemDidPlayToEndTimeNotification, object: player.currentItem)
+
                         mediaView.videoPlayerLayer.player = player
 
                         mediaView.videoPlayerLayer.player.addObserver(self, forKeyPath: "status", options: NSKeyValueObservingOptions(0), context: nil)
@@ -104,4 +109,8 @@ class MessageMediaViewController: UIViewController {
             }
         }
     }
+
+    func playerItemDidReachEnd(notification: NSNotification) {
+        mediaControlView.playState = .Pause
+    }
 }