diff --git a/package-lock.json b/package-lock.json
index fee94f698d..cc5337b6c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41542,7 +41542,7 @@
         "@contentful/f36-skeleton": "^4.68.1",
         "@contentful/f36-tokens": "^4.0.1",
         "@contentful/f36-tooltip": "^4.68.1",
-        "@contentful/f36-typography": "5.0.0-alpha.1",
+        "@contentful/f36-typography": "^4.68.1",
         "@contentful/f36-utils": "^4.23.2",
         "emotion": "^10.0.17"
       },
@@ -41551,6 +41551,22 @@
         "react-dom": ">=16.8"
       }
     },
+    "packages/components/navbar/node_modules/@contentful/f36-core": {
+      "version": "4.69.1",
+      "resolved": "https://registry.npmjs.org/@contentful/f36-core/-/f36-core-4.69.1.tgz",
+      "integrity": "sha512-JnhfFowaKM/6TD3rZkloWNMdGZKcEbMI4qEKUTjEMEt3/BlQHhJ32B0fGlwOa4pHCfiDc1hvNF2ppc1riraBLQ==",
+      "dependencies": {
+        "@contentful/f36-tokens": "^4.0.4",
+        "@emotion/core": "^10.1.1",
+        "@emotion/is-prop-valid": "^1.2.0",
+        "csstype": "^3.1.1",
+        "emotion": "^10.0.17"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
     "packages/components/navbar/node_modules/@contentful/f36-icons": {
       "version": "5.0.0-alpha.25",
       "resolved": "https://registry.npmjs.org/@contentful/f36-icons/-/f36-icons-5.0.0-alpha.25.tgz",
@@ -41570,6 +41586,21 @@
         "react-dom": ">=16.8"
       }
     },
+    "packages/components/navbar/node_modules/@contentful/f36-typography": {
+      "version": "4.69.1",
+      "resolved": "https://registry.npmjs.org/@contentful/f36-typography/-/f36-typography-4.69.1.tgz",
+      "integrity": "sha512-WT5rTpJ4r253xpGRQmektaIFGw1y5YVUf/m3XO9/hblD/K9xRLdHYMVRWTuSZRk2YtXu+ysAdMXXpfm/j6vkig==",
+      "dependencies": {
+        "@contentful/f36-core": "^4.69.1",
+        "@contentful/f36-tokens": "^4.0.4",
+        "@contentful/f36-utils": "^4.24.3",
+        "emotion": "^10.0.17"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
     "packages/components/navlist": {
       "name": "@contentful/f36-navlist",
       "version": "4.1.0-alpha.1",
@@ -52251,11 +52282,23 @@
         "@contentful/f36-skeleton": "^4.68.1",
         "@contentful/f36-tokens": "^4.0.1",
         "@contentful/f36-tooltip": "^4.68.1",
-        "@contentful/f36-typography": "5.0.0-alpha.1",
+        "@contentful/f36-typography": "^4.68.1",
         "@contentful/f36-utils": "^4.23.2",
         "emotion": "^10.0.17"
       },
       "dependencies": {
+        "@contentful/f36-core": {
+          "version": "4.69.1",
+          "resolved": "https://registry.npmjs.org/@contentful/f36-core/-/f36-core-4.69.1.tgz",
+          "integrity": "sha512-JnhfFowaKM/6TD3rZkloWNMdGZKcEbMI4qEKUTjEMEt3/BlQHhJ32B0fGlwOa4pHCfiDc1hvNF2ppc1riraBLQ==",
+          "requires": {
+            "@contentful/f36-tokens": "^4.0.4",
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^1.2.0",
+            "csstype": "^3.1.1",
+            "emotion": "^10.0.17"
+          }
+        },
         "@contentful/f36-icons": {
           "version": "5.0.0-alpha.25",
           "resolved": "https://registry.npmjs.org/@contentful/f36-icons/-/f36-icons-5.0.0-alpha.25.tgz",
@@ -52267,6 +52310,16 @@
             "@phosphor-icons/react": "^2.1.4",
             "emotion": "^10.0.17"
           }
+        },
+        "@contentful/f36-typography": {
+          "version": "4.69.1",
+          "resolved": "https://registry.npmjs.org/@contentful/f36-typography/-/f36-typography-4.69.1.tgz",
+          "integrity": "sha512-WT5rTpJ4r253xpGRQmektaIFGw1y5YVUf/m3XO9/hblD/K9xRLdHYMVRWTuSZRk2YtXu+ysAdMXXpfm/j6vkig==",
+          "requires": {
+            "@contentful/f36-core": "^4.69.1",
+            "@contentful/f36-tokens": "^4.0.4",
+            "@contentful/f36-utils": "^4.24.3",
+            "emotion": "^10.0.17"
         }
       }
     },
diff --git a/packages/components/navbar/package.json b/packages/components/navbar/package.json
index 8acbbe1024..e46c7bda60 100644
--- a/packages/components/navbar/package.json
+++ b/packages/components/navbar/package.json
@@ -15,7 +15,7 @@
     "@contentful/f36-skeleton": "^4.68.1",
     "@contentful/f36-tokens": "^4.0.1",
     "@contentful/f36-tooltip": "^4.68.1",
-    "@contentful/f36-typography": "5.0.0-alpha.1",
+    "@contentful/f36-typography": "^4.68.1",
     "@contentful/f36-utils": "^4.23.2",
     "emotion": "^10.0.17"
   },
diff --git a/packages/components/navbar/src/NavbarSwitcher/NavbarSwitcher.tsx b/packages/components/navbar/src/NavbarSwitcher/NavbarSwitcher.tsx
index 49d93008b9..4738e97e07 100644
--- a/packages/components/navbar/src/NavbarSwitcher/NavbarSwitcher.tsx
+++ b/packages/components/navbar/src/NavbarSwitcher/NavbarSwitcher.tsx
@@ -169,13 +169,17 @@ function _NavbarSwitcher(
             ) : (
               <>
                 <SwitcherLabel type="space" value={space} styles={styles} />
-                <CaretRightIcon size="tiny" color={tokens.gray500} />
-                <SwitcherLabel
-                  envVariant={envVariant}
-                  type="environment"
-                  value={environment}
-                  styles={styles}
-                />
+                {environment && (
+                  <>
+                    <CaretRightIcon size="tiny" color={tokens.gray500} />
+                    <SwitcherLabel
+                      envVariant={envVariant}
+                      type="environment"
+                      value={environment}
+                      styles={styles}
+                    />
+                  </>
+                )}
               </>
             )}
           </Flex>
diff --git a/packages/components/navbar/stories/Navbar.stories.tsx b/packages/components/navbar/stories/Navbar.stories.tsx
index dfaf472b94..4ec1b0042f 100644
--- a/packages/components/navbar/stories/Navbar.stories.tsx
+++ b/packages/components/navbar/stories/Navbar.stories.tsx
@@ -141,6 +141,27 @@ Basic.args = {
     'https://images.ctfassets.net/iq4lnigp6fgt/2EEEk92Kiz6KxREsjBLPAN/810d5a21650d91abad12e95da4cd3beb/2021-06_Everyone_is_Welcome_here_1_.png?fit=fill&f=top_left&w=100&h=100',
 };
 
+export const BasicNoEnvironment: Story<{
+  initials?: string;
+  avatar?: string;
+}> = (args) => {
+  return (
+    <div style={{ minWidth: '900px' }}>
+      <Navbar
+        mainNavigation={<MainItems />}
+        switcher={<Navbar.Switcher space="Our super long space name" />}
+        account={<Account {...args} />}
+      />
+    </div>
+  );
+};
+
+BasicNoEnvironment.args = {
+  initials: 'AB',
+  avatar:
+    'https://images.ctfassets.net/iq4lnigp6fgt/2EEEk92Kiz6KxREsjBLPAN/810d5a21650d91abad12e95da4cd3beb/2021-06_Everyone_is_Welcome_here_1_.png?fit=fill&f=top_left&w=100&h=100',
+};
+
 export const SizeVariants: Story<NavbarProps> = () => {
   return (
     <Flex gap="spacingL" style={{ width: '97vw' }} flexDirection="column">