diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c4290495a..f5211b8bf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fixed #11783: Instances deleted during realtime run
  - fixed #11781: Thingy wrong retorn value from Ajax method
  - fixed #11780: fixFilenames regex needs an anchor in ZipArchive asset
+ - fixed #11782: Attachments all showing duplicated first thumbnail
 
 7.9.12
  - webgui.org homepage gives 404  (#11778)
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index ef2b2e228..6ef964efb 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -790,11 +790,11 @@ sub getTemplateVars {
 				$gotAttachment = 1;
        			}	
 			push(@{$var{"attachment_loop"}}, {
-				url       =>$fileUrl,
-				icon      =>$var{"attachment.icon"},
-				filename  =>$filename,
-				thumbnail =>$var{"image.thumbnail"},
-				isImage   =>$isImage
+				url       => $fileUrl,
+				icon      => $storage->getFileIconUrl($filename),
+				filename  => $filename,
+				thumbnail => $isImage ? $storage->getThumbnailUrl($filename) : '',
+				isImage   => $isImage,
 				});
 		}
 	}