diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index 18cf4c8e8..f925e2a6c 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -276,7 +276,7 @@ Gallery =
       e.preventDefault()
       Gallery.cb.advance()
 
-    advance:   -> if Gallery.nodes.current.paused then Gallery.nodes.current.play() else Gallery.cb.next()
+    advance:   -> if !Conf['Autoplay'] and Gallery.nodes.current.paused then Gallery.nodes.current.play() else Gallery.cb.next()
     toggle:    -> (if Gallery.nodes then Gallery.cb.close else Gallery.build)()
     blank: (e) -> Gallery.cb.close() if e.target is @
     toggleSlideshow: ->  Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 844524606..2d0eb8aef 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -46,7 +46,7 @@ ImageExpand =
       {file} = post
       return if file.isExpanded and ImageCommon.onControls e
       e.preventDefault()
-      if file.fullImage?.paused
+      if !Conf['Autoplay'] and file.fullImage?.paused
         file.fullImage.play()
       else
         ImageExpand.toggle post