diff --git a/server/src/lib.rs b/server/src/lib.rs
index 79a1437e..5566ca69 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -198,8 +198,8 @@ fn fetch_iframely_and_pictshare_data(
   Option<String>,
 ) {
   // Fetch iframely data
-  let (iframely_title, iframely_description, iframely_thumbnail_url, iframely_html) = match url {
-    Some(url) => match fetch_iframely(&url) {
+  let (iframely_title, iframely_description, iframely_thumbnail_url, iframely_html) = match &url {
+    Some(url) => match fetch_iframely(url) {
       Ok(res) => (res.title, res.description, res.thumbnail_url, res.html),
       Err(e) => {
         error!("iframely err: {}", e);
@@ -218,7 +218,18 @@ fn fetch_iframely_and_pictshare_data(
         None
       }
     },
-    None => None,
+
+    None => match url {
+      Some(url) => match fetch_pictshare(&url) {
+        // Try to generate a small thumbnail if iframely is not supported
+        Ok(res) => Some(res.url),
+        Err(e) => {
+          error!("pictshare err: {}", e);
+          None
+        }
+      },
+      None => None,
+    },
   };
 
   (
diff --git a/ui/src/components/post-listing.tsx b/ui/src/components/post-listing.tsx
index d0efa043..36a1e282 100644
--- a/ui/src/components/post-listing.tsx
+++ b/ui/src/components/post-listing.tsx
@@ -150,9 +150,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     let post = this.props.post;
     return (
       <img
-        className={`img-fluid thumbnail rounded ${(post.nsfw ||
-          post.community_nsfw) &&
-          'img-blur'}`}
+        className={`img-fluid thumbnail rounded ${
+          (post.nsfw || post.community_nsfw) && 'img-blur'
+        }`}
         src={src}
       />
     );
@@ -163,6 +163,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     if (isImage(post.url)) {
       if (post.url.includes('pictshare')) {
         return pictshareImage(post.url, thumbnail);
+      } else if (post.thumbnail_url) {
+        return pictshareImage(post.thumbnail_url, thumbnail);
       } else {
         return post.url;
       }
@@ -542,8 +544,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                             }
                           >
                             <svg
-                              class={`icon icon-inline ${post.saved &&
-                                'text-warning'}`}
+                              class={`icon icon-inline ${
+                                post.saved && 'text-warning'
+                              }`}
                             >
                               <use xlinkHref="#icon-star"></use>
                             </svg>
@@ -586,8 +589,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                             }
                           >
                             <svg
-                              class={`icon icon-inline ${post.deleted &&
-                                'text-danger'}`}
+                              class={`icon icon-inline ${
+                                post.deleted && 'text-danger'
+                              }`}
                             >
                               <use xlinkHref="#icon-trash"></use>
                             </svg>
@@ -618,8 +622,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                               data-tippy-content={i18n.t('view_source')}
                             >
                               <svg
-                                class={`icon icon-inline ${this.state
-                                  .viewSource && 'text-success'}`}
+                                class={`icon icon-inline ${
+                                  this.state.viewSource && 'text-success'
+                                }`}
                               >
                                 <use xlinkHref="#icon-file-text"></use>
                               </svg>
@@ -639,8 +644,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                                 }
                               >
                                 <svg
-                                  class={`icon icon-inline ${post.locked &&
-                                    'text-danger'}`}
+                                  class={`icon icon-inline ${
+                                    post.locked && 'text-danger'
+                                  }`}
                                 >
                                   <use xlinkHref="#icon-lock"></use>
                                 </svg>
@@ -657,8 +663,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                                 }
                               >
                                 <svg
-                                  class={`icon icon-inline ${post.stickied &&
-                                    'text-success'}`}
+                                  class={`icon icon-inline ${
+                                    post.stickied && 'text-success'
+                                  }`}
                                 >
                                   <use xlinkHref="#icon-pin"></use>
                                 </svg>