diff --git a/webapp/channels/src/components/announcement_bar/no_internet_connection/no_internet_connection.tsx b/webapp/channels/src/components/announcement_bar/no_internet_connection/no_internet_connection.tsx
index e75427dec7..6fffb4c613 100644
--- a/webapp/channels/src/components/announcement_bar/no_internet_connection/no_internet_connection.tsx
+++ b/webapp/channels/src/components/announcement_bar/no_internet_connection/no_internet_connection.tsx
@@ -6,9 +6,9 @@ import {FormattedMessage} from 'react-intl';
 
 import {GenericModal} from '@mattermost/components';
 
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
-
 import './no_internet_connection.scss';
+import ExternalLink from 'components/external_link';
+
 import NoInternetConnectionSvg from './no-internet-connection-svg';
 
 type NoInternetConnectionProps = {
@@ -38,10 +38,19 @@ const NoInternetConnection: React.FC<NoInternetConnectionProps> = (props: NoInte
                     />
                 </span>
                 <span className='noInternetConnection__emailUs'>
-                    <FormattedMarkdownMessage
-                        id='announcement_bar.warn.email_support'
-                        defaultMessage='[Contact support](!{email}).'
-                        values={{email: 'mailto:support@mattermost.com'}}
+                    <FormattedMessage
+                        id='announcement_bar.warn.contact_support_email'
+                        defaultMessage='<a>Contact support</a>.'
+                        values={{
+                            a: (chunks: string) => (
+                                <ExternalLink
+                                    href='mailto:support@mattermost.com'
+                                    location='announcement_bar'
+                                >
+                                    {chunks}
+                                </ExternalLink>
+                            ),
+                        }}
                     />
                 </span>
             </div>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 39cff8dfe0..c65a3a40cd 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -2887,8 +2887,8 @@
   "announcement_bar.notification.email_verified": "Email verified",
   "announcement_bar.notification.enable_notifications": "Enable notifications",
   "announcement_bar.notification.needs_permission": "We need your permission to show desktop notifications.",
+  "announcement_bar.warn.contact_support_email": "<a>Contact support</a>.",
   "announcement_bar.warn.contact_support_text": "To renew your license, contact support at support@mattermost.com.",
-  "announcement_bar.warn.email_support": "[Contact support](!{email}).",
   "announcement_bar.warn.no_internet_connection": "Looks like you do not have access to the internet.",
   "announcement_bar.warn.renew_license_contact_sales": "Contact sales",
   "api.channel.add_guest.added": "{addedUsername} added to the channel as a guest by {username}.",