diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx
index 975ffd668..d5514ada4 100644
--- a/ts/components/conversation/Linkify.tsx
+++ b/ts/components/conversation/Linkify.tsx
@@ -31,8 +31,8 @@ export class Linkify extends React.Component<Props> {
         <div
           dangerouslySetInnerHTML={{
             __html: text
-              .replace(/(<? *script)/gi, '')
-              .replace(/(<? *script)/gi, ''),
+              .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
+              .replace(/<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>/gi, ''),
           }}
         />
       );