diff --git a/src/navigator/DrawerNavigator.tsx b/src/navigator/DrawerNavigator.tsx
index 5579e312ee4..947ce153769 100644
--- a/src/navigator/DrawerNavigator.tsx
+++ b/src/navigator/DrawerNavigator.tsx
@@ -225,13 +225,34 @@ export default function DrawerNavigator() {
         component={WalletHome}
         options={{ title: t('home'), drawerIcon: Home, unmountOnBlur: false }}
       />
-      {shouldShowSwapMenuInDrawerMenu && (
+      {shouldShowSwapMenuInDrawerMenu ? (
         <Drawer.Screen
           name={Screens.SwapScreen}
           component={() => null}
           options={{ title: t('swap'), drawerIcon: Swap }}
         />
+      ) : (
+        <>
+          {(isCeloEducationComplete && (
+            <Drawer.Screen
+              name={Screens.ExchangeHomeScreen}
+              component={ExchangeHomeScreen}
+              options={{ title: t('celoGold'), drawerIcon: Gold }}
+            />
+          )) || (
+            <Drawer.Screen
+              name={Screens.GoldEducation}
+              component={GoldEducation}
+              options={{
+                title: t('celoGold'),
+                drawerIcon: Gold,
+                ...TransitionPresets.ModalTransition,
+              }}
+            />
+          )}
+        </>
       )}
+
       {dappsListUrl && (
         <Drawer.Screen
           name={Screens.DAppsExplorerScreen}
@@ -281,23 +302,28 @@ export default function DrawerNavigator() {
           options={{ title: t('invite'), drawerIcon: Invite }}
         />
       )}
-      {(isCeloEducationComplete && (
-        <Drawer.Screen
-          name={Screens.ExchangeHomeScreen}
-          component={ExchangeHomeScreen}
-          options={{ title: t('celoGold'), drawerIcon: Gold }}
-        />
-      )) || (
-        <Drawer.Screen
-          name={Screens.GoldEducation}
-          component={GoldEducation}
-          options={{
-            title: t('celoGold'),
-            drawerIcon: Gold,
-            ...TransitionPresets.ModalTransition,
-          }}
-        />
+      {shouldShowSwapMenuInDrawerMenu && (
+        <>
+          {(isCeloEducationComplete && (
+            <Drawer.Screen
+              name={Screens.ExchangeHomeScreen}
+              component={ExchangeHomeScreen}
+              options={{ title: t('celoGold'), drawerIcon: Gold }}
+            />
+          )) || (
+            <Drawer.Screen
+              name={Screens.GoldEducation}
+              component={GoldEducation}
+              options={{
+                title: t('celoGold'),
+                drawerIcon: Gold,
+                ...TransitionPresets.ModalTransition,
+              }}
+            />
+          )}
+        </>
       )}
+
       <Drawer.Screen
         name={Screens.Settings}
         component={SettingsScreen}