diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 94c566482..b9153461f 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -22,7 +22,7 @@ ImageExpand =
       ImageExpand.contract @
       ImageExpand.expand @
       return
-    if ImageExpand.on and !@isHidden
+    if ImageExpand.on and !@isHidden and (Conf['Expand spoilers'] or !@file.isSpoiler)
       ImageExpand.expand @
   cb:
     toggle: (e) ->