diff --git a/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx b/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
index 93cb8ab263..3d12cd5e54 100644
--- a/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
+++ b/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
@@ -57,7 +57,6 @@ const ProductBrandingFreeEdition = (): JSX.Element => {
                 width={116}
                 height={20}
             />
-            <Badge>{badgeText}</Badge>
         </ProductBrandingFreeEditionContainer>
     );
 };
diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss
index c2e6fbd187..bc1cedcff1 100644
--- a/channels/src/components/header_footer_route/header.scss
+++ b/channels/src/components/header_footer_route/header.scss
@@ -47,20 +47,7 @@
             }
 
             .freeBadge {
-                position: relative;
-                top: 1px;
-                display: flex;
-                align-self: center;
-                padding: 2px 6px;
-                border-radius: var(--radius-s);
-                margin-left: 12px;
-                background: rgba(var(--center-channel-color-rgb), 0.08);
-                color: rgba(var(--center-channel-color-rgb), 0.75);
-                font-family: 'Open Sans', sans-serif;
-                font-size: 10px;
-                font-weight: 600;
-                letter-spacing: 0.025em;
-                line-height: 16px;
+                display: none !important;
             }
         }
     }
@@ -83,12 +70,6 @@
             margin-top: 12px;
         }
     }
-
-    &.has-free-banner.has-custom-site-name {
-        .header-back-button {
-            bottom: -20px;
-        }
-    }
 }
 
 @media screen and (max-width: 699px) {
diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss
index dee9b57f8c..8ef4aa073a 100644
--- a/channels/src/components/widgets/menu/menu_items/menu_item.scss
+++ b/channels/src/components/widgets/menu/menu_items/menu_item.scss
@@ -316,14 +316,7 @@
     }
 
     .MenuStartTrial {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        padding: 8px 20px;
-        border-radius: 4px;
-        margin-top: 0;
-        font-size: 12px;
-        line-height: 16px;
+        display: none !important;
 
         button {
             padding: 3px 0;
diff --git a/channels/webpack.config.js b/channels/webpack.config.js
index 852046de70..a310da48f4 100644
--- a/channels/webpack.config.js
+++ b/channels/webpack.config.js
@@ -470,6 +470,9 @@ if (targetIsDevServer) {
             historyApiFallback: {
                 index: '/static/root.html',
             },
+            client: {
+                overlay: false,
+            },
         },
         performance: false,
         optimization: {