diff --git a/src/Resources/contao/Modules/SocialFeedSetup.php b/src/Resources/contao/Modules/SocialFeedSetup.php
index 9549a35..93152a0 100644
--- a/src/Resources/contao/Modules/SocialFeedSetup.php
+++ b/src/Resources/contao/Modules/SocialFeedSetup.php
@@ -19,7 +19,7 @@ class SocialFeedSetup extends \BackendModule
     /**
      * social-feed-bundle version
      */
-    const VERSION = '2.1.2';
+    const VERSION = '2.1.3';
 
     /**
      * Template
diff --git a/src/Resources/contao/templates/modules/news_social_feed.html5 b/src/Resources/contao/templates/modules/news_social_feed.html5
index d64a754..ff26a3f 100644
--- a/src/Resources/contao/templates/modules/news_social_feed.html5
+++ b/src/Resources/contao/templates/modules/news_social_feed.html5
@@ -2,7 +2,7 @@
 <div class="social_feed_element arc_<?= $this->archive->id ?> block<?= $this->class ?> <?= $this->sfElementWidth ?>" itemscope itemtype="http://schema.org/Article">
     <div class="inner">
 
-        <a href="<?= $this->sfFbLink ?>" target="_blank">
+        <a href="<?= $this->url ?>" target="_blank">
             <div class="icon">
                 {{picture::<?php echo \StringUtil::binToUuid($this->sfFbAccountPicture); ?>}}
             </div>
@@ -12,11 +12,15 @@
             <?php endif; ?>
 
             <div class="title"><?= $this->sfFbAccount ?></div>
+        </a>
 
-            <?php if ($this->addImage && $this->sfImages): ?>
-                <?php $this->insert('image', $this->arrData); ?>
-            <?php endif; ?>
+        <?php if($this->arrData['url'] == ""): ?><a href="<?= $this->url ?>" target="_blank"><?php endif; ?>
+        <?php if ($this->addImage && $this->sfImages): ?>
+            <?php $this->insert('image', $this->arrData); ?>
+        <?php endif; ?>
+        <?php if($this->arrData['url'] == ""): ?></a><?php endif; ?>
 
+        <a href="<?= $this->url ?>" target="_blank">
             <div class="ce_text block" itemprop="description">
                 <?= $this->teaser ?>
             </div>