diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 93e23963a..20a749167 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -168,14 +168,14 @@ ImageExpand =
 
     if file.fullImage
       el = file.fullImage
-    else if ImageCommon.cache?.dataset.fullID is post.fullID
+    else if ImageCommon.cache?.dataset.fileID is "#{post.fullID}.#{file.index}"
       el = file.fullImage = ImageCommon.popCache()
       $.on el, 'error', ImageExpand.error
       ImageCommon.rewind el if Conf['Restart when Opened'] and el.id isnt 'ihover'
       el.removeAttribute 'id'
     else
       el = file.fullImage = $.el (if isVideo then 'video' else 'img')
-      el.dataset.fullID = post.fullID
+      el.dataset.fileID = "#{post.fullID}.#{file.index}"
       $.on el, 'error', ImageExpand.error
       el.src = src or file.url
 
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index cf6ddf0ce..68c1e227f 100644
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -24,12 +24,12 @@ ImageHover =
     {isVideo} = file
     return if file.isExpanding or file.isExpanded or g.SITE.isThumbExpanded?(file)
     error = ImageHover.error post, file
-    if ImageCommon.cache?.dataset.fullID is post.fullID
+    if ImageCommon.cache?.dataset.fileID is "#{post.fullID}.#{file.index}"
       el = ImageCommon.popCache()
       $.on el, 'error', error
     else
       el = $.el (if isVideo then 'video' else 'img')
-      el.dataset.fullID = post.fullID
+      el.dataset.fileID = "#{post.fullID}.#{file.index}"
       $.on el, 'error', error
       el.src = file.url