diff --git a/index.php b/index.php
index 55d02c1..b310f99 100644
--- a/index.php
+++ b/index.php
@@ -800,9 +800,24 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager)
             {
                 $link['thumbnail']=$thumb; // Thumbnail HTML code.
             }
+
             $thumUrl = $conf->get('plugins.ExternalThumbshot_URL');
+            if(!empty($conf->get('plugins.ExternalThumbshot_KEY'))){
+                $key = $conf->get('plugins.ExternalThumbshot_KEY');
+            }
             if(empty($link['thumbnail'])){
-              $link['thumbnail'] = '<img class="b-lazy" src="#" data-src="'.$thumUrl.urlencode($link['url']).'" alt="Thumbnail" width="120" height="90">';
+                $thumb = computeThumbnail($conf, $link['url']);
+                if(empty($thumb)){
+                    if(!empty($key)){
+                        $hmac = '&amp;hm='.hash_hmac('sha1', $link['url'], $key).'&amp;url=';
+                    } else {
+                        $hmac = null;
+                    }
+                  $link['thumbnail'] = '<img class="b-lazy" src="#" data-src="'.$thumUrl.$hmac.urlencode($link['url']).'" alt="Thumbnail" width="120" height="90">';
+                } else {
+                  $link['thumbnail'] = '<img class="b-lazy" src="#" data-src="'.$thumb['src'].'" alt="Thumbnail" width="120" height="90">';
+                }
+
             }
           $linksToDisplay[]=$link; // Add to array.
         }