diff --git a/app/actions/navigation/index.js b/app/actions/navigation/index.js
index bb39129cc..df0944533 100644
--- a/app/actions/navigation/index.js
+++ b/app/actions/navigation/index.js
@@ -377,7 +377,7 @@ export async function dismissModal(options = {}) {
         return;
     }
 
-    const componentId = EphemeralStore.getNavigationTopComponentId();
+    const componentId = options.componentId || EphemeralStore.getNavigationTopComponentId();
 
     try {
         await Navigation.dismissModal(componentId, options);
diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js
index 6d3eac38e..cd06bdb76 100644
--- a/app/screens/edit_profile/edit_profile.js
+++ b/app/screens/edit_profile/edit_profile.js
@@ -179,11 +179,11 @@ export default class EditProfile extends PureComponent {
     };
 
     close = () => {
-        const {commandType} = this.props;
+        const {commandType, componentId} = this.props;
         if (commandType === 'Push') {
-            popTopScreen();
+            popTopScreen(componentId);
         } else {
-            dismissModal();
+            dismissModal({componentId});
         }
     };