diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
index e476a9f89..5b80169e5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/StartupActivity.java
@@ -89,13 +89,9 @@ public class StartupActivity extends BaseActivity implements
 			if (!isFragmentAdded(PasswordFragment.TAG)) {
 				showInitialFragment(new PasswordFragment());
 			}
-		} else if (state == SIGNED_IN) {
+		} else if (state == SIGNED_IN || state == STARTING) {
 			startService(new Intent(this, BriarService.class));
-		} else if (state == STARTING) {
 			// Only show OpenDatabaseFragment if not already visible.
-			// This can happen because several LifecycleManager states are
-			// mapped to STARTING, so this can get called several times
-			// as the app's lifecycle advances.
 			if (!isFragmentAdded(OpenDatabaseFragment.TAG)) {
 				showNextFragment(new OpenDatabaseFragment());
 			}