diff --git a/src/Main.tsx b/src/Main.tsx
index 14484e44f..bf7b0a26e 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -14,6 +14,7 @@ import { withContext as withAuthenticationContext } from './components/authentic
 import { MessengerChat } from './components/messenger/chat';
 import { DevPanelContainer } from './components/dev-panel/container';
 import { FeatureFlag } from './components/feature-flag';
+import { featureFlags } from './lib/feature-flags';
 
 export interface Properties {
   hasContextPanel: boolean;
@@ -78,9 +79,11 @@ export class Container extends React.Component<Properties> {
         </div>
         {!this.props.isMessengerFullScreen && (
           <div className='main__header'>
-            <div className='main__address-bar-wrapper'>
-              <AddressBarContainer className='main__address-bar' />
-            </div>
+            {!featureFlags.enableMatrix && (
+              <div className='main__address-bar-wrapper'>
+                <AddressBarContainer className='main__address-bar' />
+              </div>
+            )}
             <div className='main__wallet-manager-wrapper'>
               <WalletManager className='main__wallet-manager' />
             </div>
diff --git a/src/main.scss b/src/main.scss
index 53abd909e..b71ff53ae 100644
--- a/src/main.scss
+++ b/src/main.scss
@@ -115,6 +115,7 @@ $border-color-hover: theme-zui.$color-primary-7;
     top: $platform-padding;
     display: flex;
     align-items: center;
+    justify-content: flex-end;
     gap: 16px;
     padding: 0 16px;