diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index a200828f..4e55c714 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -1774,7 +1774,12 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
 
                     cell.configureWithMessage(message, messageImagePreferredWidth: messageImagePreferredWidth, messageImagePreferredHeight: messageImagePreferredHeight, messageImagePreferredAspectRatio: messageImagePreferredAspectRatio, mediaTapAction: { [unowned self] in
 
-                        self.performSegueWithIdentifier("showMessageMedia", sender: message)
+                        if message.downloadState == MessageDownloadState.Downloaded.rawValue {
+                            self.performSegueWithIdentifier("showMessageMedia", sender: message)
+
+                        } else {
+                            YepAlert.alertSorry(message: NSLocalizedString("Please wait while the image is not dready!", comment: ""), inViewController: self)
+                        }
 
                         //let frame = cell.convertRect(cell.messageImageView.frame, toView: self.view.window)
 
@@ -1803,7 +1808,12 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
 
                     cell.configureWithMessage(message, messageImagePreferredWidth: messageImagePreferredWidth, messageImagePreferredHeight: messageImagePreferredHeight, messageImagePreferredAspectRatio: messageImagePreferredAspectRatio, mediaTapAction: { [unowned self] in
 
-                        self.performSegueWithIdentifier("showMessageMedia", sender: message)
+                        if message.downloadState == MessageDownloadState.Downloaded.rawValue {
+                            self.performSegueWithIdentifier("showMessageMedia", sender: message)
+
+                        } else {
+                            YepAlert.alertSorry(message: NSLocalizedString("Please wait while the video is not dready!", comment: ""), inViewController: self)
+                        }
 
                         //let frame = cell.convertRect(cell.thumbnailImageView.frame, toView: self.view.window)