diff --git a/src/Model/Item.php b/src/Model/Item.php
index a3a9fdb184..516b7d1e9b 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3861,6 +3861,11 @@ class Item
 				$preview_mode = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
 				if ($preview_mode != BBCode::PREVIEW_NONE) {
 					$rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid, $preview_mode);
+				} elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
+					$rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
+						'$url'   => $data['url'],
+						'$title' => $data['title'],
+					]);
 				} else {
 					$rendered = '';
 				}