diff --git a/lib/Thruk/Utils/Filter.pm b/lib/Thruk/Utils/Filter.pm
index 017aeca841..196e97ec3d 100644
--- a/lib/Thruk/Utils/Filter.pm
+++ b/lib/Thruk/Utils/Filter.pm
@@ -1613,7 +1613,7 @@ sub replace_links {
/gxme;
# standard text link: https://link.domain/...
- $txt =~ s/(https?:\/\/(?:www\.)?[-a-zA-Z0-9\@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()\@:%_\+.~#?&\/=]*))(\s|
|$)
+ $txt =~ s/(?:^|\s)(https?:\/\/(?:www\.)?[-a-zA-Z0-9\@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()\@:%_\+.~#?&\/=]*))(\s|
|$)
/<\/i>$1<\/a>$2
/gmx;