diff --git a/assets/js/templates/Item.jsx b/assets/js/templates/Item.jsx
index fac921c6cf..f8cfc7f9fe 100644
--- a/assets/js/templates/Item.jsx
+++ b/assets/js/templates/Item.jsx
@@ -393,8 +393,8 @@ export default function Item({ item, selected, expanded, setNavExpanded }) {
                 : null}
 
             {/* thumbnail */}
-            {selfoss.config.showThumbnails && item.thumbnail && item.thumbnail.trim().length > 0 ?
-                <div className="entry-thumbnail">
+            {item.thumbnail && item.thumbnail.trim().length > 0 ?
+                <div className={classNames({'entry-thumbnail': true, 'entry-thumbnail-always-visible': selfoss.config.showThumbnails})}>
                     <a href={anonymize(item.link)} target="_blank" rel="noopener noreferrer">
                         <img src={`thumbnails/${item.thumbnail}`} alt={item.strippedTitle} />
                     </a>
diff --git a/assets/styles/main.scss b/assets/styles/main.scss
index ec7edc5248..d20b5e97ba 100644
--- a/assets/styles/main.scss
+++ b/assets/styles/main.scss
@@ -469,6 +469,10 @@ span.offline-count.diff {
     margin: 0 10px 5px 0;
 }
 
+.entry:not(.expanded) .entry-thumbnail:not(.entry-thumbnail-always-visible) {
+    display: none;
+}
+
 .entry:not(.expanded) .entry-content,
 .entry:not(.expanded) .entry-toolbar {
     display: none;