diff --git a/app/src/org/commcare/activities/DispatchActivity.java b/app/src/org/commcare/activities/DispatchActivity.java
index 6674e8d403..6e32b654cb 100644
--- a/app/src/org/commcare/activities/DispatchActivity.java
+++ b/app/src/org/commcare/activities/DispatchActivity.java
@@ -350,6 +350,10 @@ private void handleExternalLaunch() {
                         i.putExtra(SESSION_ENDPOINT_ID, sessionEndpointId);
                         i.putExtra(SESSION_ENDPOINT_ARGUMENTS_BUNDLE, args);
                         i.putStringArrayListExtra(SESSION_ENDPOINT_ARGUMENTS_LIST, argsList);
+
+                        // Session Endpoint extra is no longer needed. If not removed, it triggers
+                        // the external launch logic in subsequent logins
+                        getIntent().removeExtra(SESSION_ENDPOINT_ID);
                     }
                     if (i != null) {
                         i.putExtra(WAS_EXTERNAL, true);