diff --git a/shared/js/ui/frames/chat_frame.ts b/shared/js/ui/frames/chat_frame.ts
index 9552e815..203184ba 100644
--- a/shared/js/ui/frames/chat_frame.ts
+++ b/shared/js/ui/frames/chat_frame.ts
@@ -503,18 +503,20 @@ namespace chat {
                         log.debug(LogCategory.GENERAL, tr("Chat message contains URL: %o"), url);
                         if(url.protocol !== 'http:' && url.protocol !== 'https:')
                             break _try;
-                        if(flag_escaped)
+                        if(flag_escaped) {
+                            message = undefined;
                             words[index] = unescaped;
-                        else {
+                        } else {
                             message = undefined;
                             words[index] = "[url=" + url.toString() + "]" + url.toString() + "[/url]";
                         }
                     } catch(e) { /* word isn't an url */ }
 
                 if(unescaped.match(URL_REGEX)) {
-                    if(flag_escaped)
+                    if(flag_escaped) {
+                        message = undefined;
                         words[index] = unescaped;
-                    else {
+                    } else {
                         message = undefined;
                         words[index] = "[url=" + unescaped + "]" + unescaped + "[/url]";
                     }