diff --git a/src/components/views/All.jsx b/src/components/views/All.jsx
index 47072883..b09e92f9 100755
--- a/src/components/views/All.jsx
+++ b/src/components/views/All.jsx
@@ -756,7 +756,7 @@ const All = () => {
                               )}
                               {commentMediaInfo?.type === "webpage" ? (
                                 <div key={`enlarge-${index}`} className="img-container">
-                                  <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] ? {} : {width: displayWidth, height: displayHeight}}>
+                                  <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidth, height: displayHeight}}>
                                     {thread.thumbnailUrl ? (
                                       <img key={`fti-${index}`} 
                                       src={commentMediaInfo.thumbnail} alt={commentMediaInfo.type}
@@ -1431,7 +1431,7 @@ const All = () => {
                                 </div>
                                 {replyMediaInfo?.type === "webpage" ? (
                                   <div key={`enlarge-reply-${index}`} className="img-container">
-                                    <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
+                                    <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
                                       {reply.thumbnailUrl ? (
                                         <img key={`fti-${index}`}
                                         src={replyMediaInfo.thumbnail} alt={replyMediaInfo.type}
@@ -1842,7 +1842,7 @@ const All = () => {
                                 {commentMediaInfo?.url ? (
                                   commentMediaInfo.type === "webpage" ? (
                                     <div key={`enlarge-mob-${index}`} className="img-container">
-                                      <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
+                                      <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
                                         {thread.thumbnailUrl ? (
                                           <img key={`mob-img-${index}`} 
                                           src={commentMediaInfo.thumbnail} alt="thumbnail" 
@@ -2048,7 +2048,7 @@ const All = () => {
                                 {replyMediaInfo?.url ? (
                                   replyMediaInfo.type === "webpage" ? (
                                     <div key={`enlarge-mob-reply-${index}`} className="img-container">
-                                      <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
+                                      <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
                                         {reply.thumbnailUrl ? (
                                           <img key={`mob-img-${index}`} 
                                           src={replyMediaInfo.thumbnail} alt="thumbnail" 
diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index 73847534..9224996a 100755
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -1415,7 +1415,7 @@ const Board = () => {
                                   )}
                                   {commentMediaInfo?.type === "webpage" ? (
                                     <div key={`enlarge-${index}`} className="img-container">
-                                      <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] ? {} : {width: displayWidth, height: displayHeight}}>
+                                      <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidth, height: displayHeight}}>
                                         {thread.thumbnailUrl ? (
                                           <img key={`fti-${index}`} 
                                           src={commentMediaInfo.thumbnail} alt={commentMediaInfo.type}
@@ -1463,7 +1463,7 @@ const Board = () => {
                                   </div>
                                   ) : null}
                                   {commentMediaInfo?.type === "audio" ? (
-                                    <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] ? {} : {width: displayWidth, height: displayHeight}}>
+                                    <span key={`fta-${index}`} className="file-thumb">
                                       <audio controls key={`fti-${index}`} 
                                       src={commentMediaInfo.url} alt={commentMediaInfo.type}
                                       onError={(e) => e.target.src = fallbackImgUrl} />
@@ -2085,7 +2085,7 @@ const Board = () => {
                                         </div>
                                         {replyMediaInfo?.type === "webpage" ? (
                                           <div key={`enlarge-reply-${index}`} className="img-container">
-                                            <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
+                                            <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
                                               {reply.thumbnailUrl ? (
                                                 <img key={`fti-${index}`}
                                                 src={replyMediaInfo.thumbnail} alt={replyMediaInfo.type}
@@ -2489,7 +2489,7 @@ const Board = () => {
                                     {commentMediaInfo?.url ? (
                                       commentMediaInfo.type === "webpage" ? (
                                         <div key={`enlarge-mob-${index}`} className="img-container">
-                                          <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
+                                          <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
                                             {thread.thumbnailUrl ? (
                                               <img key={`mob-img-${index}`} 
                                               src={commentMediaInfo.thumbnail} alt="thumbnail" 
@@ -2684,7 +2684,7 @@ const Board = () => {
                                       {replyMediaInfo?.url ? (
                                         replyMediaInfo.type === "webpage" ? (
                                           <div key={`enlarge-mob-reply-${index}`} className="img-container">
-                                            <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
+                                            <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
                                               {reply.thumbnailUrl ? (
                                                 <img key={`mob-img-${index}`} 
                                                 src={replyMediaInfo.thumbnail} alt="thumbnail" 
diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx
index 7ce31183..704ca499 100755
--- a/src/components/views/Subscriptions.jsx
+++ b/src/components/views/Subscriptions.jsx
@@ -767,7 +767,7 @@ const Subscriptions = () => {
                               )}
                               {commentMediaInfo?.type === "webpage" ? (
                                 <div key={`enlarge-${index}`} className="img-container">
-                                  <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] ? {} : {width: displayWidth, height: displayHeight}}>
+                                  <span key={`fta-${index}`} className="file-thumb" style={isThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidth, height: displayHeight}}>
                                     {thread.thumbnailUrl ? (
                                       <img key={`fti-${index}`} 
                                       src={commentMediaInfo.thumbnail} alt={commentMediaInfo.type}
@@ -1442,7 +1442,7 @@ const Subscriptions = () => {
                                 </div>
                                 {replyMediaInfo?.type === "webpage" ? (
                                   <div key={`enlarge-reply-${index}`} className="img-container">
-                                    <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
+                                    <span key={`fta-${index}`} className="file-thumb-reply" style={isReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: replyDisplayWidth, height: replyDisplayHeight}}>
                                       {reply.thumbnailUrl ? (
                                         <img key={`fti-${index}`}
                                         src={replyMediaInfo.thumbnail} alt={replyMediaInfo.type}
@@ -1853,7 +1853,7 @@ const Subscriptions = () => {
                                 {commentMediaInfo?.url ? (
                                   commentMediaInfo.type === "webpage" ? (
                                     <div key={`enlarge-mob-${index}`} className="img-container">
-                                      <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
+                                      <span key={`mob-ft${thread.cid}`} className="file-thumb-mobile" style={isMobileThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px'}}>
                                         {thread.thumbnailUrl ? (
                                           <img key={`mob-img-${index}`} 
                                           src={commentMediaInfo.thumbnail} alt="thumbnail" 
@@ -2059,7 +2059,7 @@ const Subscriptions = () => {
                                 {replyMediaInfo?.url ? (
                                   replyMediaInfo.type === "webpage" ? (
                                     <div key={`enlarge-mob-reply-${index}`} className="img-container">
-                                      <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
+                                      <span key={`mob-ft${reply.cid}`} className="file-thumb-mobile" style={isMobileReplyThumbnailClicked[index] || !reply.thumbnailUrl ? {} : {width: displayWidthMobile, height: displayHeightMobile}}>
                                         {reply.thumbnailUrl ? (
                                           <img key={`mob-img-${index}`} 
                                           src={replyMediaInfo.thumbnail} alt="thumbnail"