diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 91cc64dcc..282dc0bf9 100644
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -23,7 +23,7 @@ ImageHover =
     return unless doc.contains @
     {file} = post
     {isVideo} = file
-    return if file.isExpanding or file.isExpanded
+    return if file.isExpanding or file.isExpanded or Site.isThumbExpanded?(file)
     error = ImageHover.error post
     if ImageCommon.cache?.dataset.fullID is post.fullID
       el = ImageCommon.popCache()
diff --git a/src/site/SW.tinyboard.coffee b/src/site/SW.tinyboard.coffee
index 5deb89d01..d98eb95ac 100644
--- a/src/site/SW.tinyboard.coffee
+++ b/src/site/SW.tinyboard.coffee
@@ -117,3 +117,7 @@ SW.tinyboard =
         thumbURL:  if '/static/' in thumb.src then link.href else thumb.src
         isSpoiler: !!info[1]
     true
+
+  isThumbExpanded: (file) ->
+    # Detect old Tinyboard image expansion that changes src attribute on thumbnail.
+    $.hasClass file.thumb.parentNode, 'expanded'