diff --git a/Signal-Windows/Controls/Message.xaml.cs b/Signal-Windows/Controls/Message.xaml.cs
index 5135dc3..a282cc5 100644
--- a/Signal-Windows/Controls/Message.xaml.cs
+++ b/Signal-Windows/Controls/Message.xaml.cs
@@ -167,13 +167,20 @@ private void UpdateMessageTextBlock()
                     }
                     catch (Exception)
                     {
+                        MessageContentTextBlock.Inlines.Add(new Run()
+                        {
+                            Text = link
+                        });
                         continue;
                     }
+                    finally
+                    {
+                        previousIndex = currentIndex + match.Length;
+                        currentIndex = previousIndex;
+                    }
                     hyperlink.UnderlineStyle = UnderlineStyle.Single;
                     hyperlink.Inlines.Add(hyperlinkRun);
                     MessageContentTextBlock.Inlines.Add(hyperlink);
-                    previousIndex = currentIndex + match.Length;
-                    currentIndex = previousIndex;
                 }
 
                 // Then finish up by adding the rest of the message text to the TextBox