diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index 4313be2f4..a05fe64d8 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -24,7 +24,7 @@ Gallery =
         Gallery.generateThumb @, file
         Gallery.nodes.total.textContent = Gallery.images.length
 
-      unless Conf['Image Expansion']
+      unless Conf['Image Expansion'] or (g.SITE.software is 'tinyboard' and Main.jsEnabled)
         $.on file.thumbLink, 'click', Gallery.cb.image
 
   build: (image) ->