diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java
index f9ef0041..73ec2169 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java
@@ -104,10 +104,6 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
                         isVideo = true;
                         activity.invalidateActionBar();
                         showProgressBar(false);
-
-                        if (ChanPreferences.getVideoAutoPlay()) {
-                            startVideo();
-                        }
                     } else {
                         imageView.setBigImage(post.imageUrl);
                     }
@@ -143,8 +139,14 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal
 
         activity.invalidateActionBar();
 
-        if (ChanPreferences.getVideoAutoPlay() && imageView != null && imageView.getVideoView() != null) {
-            imageView.getVideoView().start();
+        if (isVideo && ChanPreferences.getVideoAutoPlay() && imageView != null) {
+            if (!videoVisible) {
+                startVideo();
+            } else {
+                if (imageView.getVideoView() != null) {
+                    imageView.getVideoView().start();
+                }
+            }
         }
     }