diff --git a/android/app/src/main/java/com/zeus/LndMobileScheduledSyncWorker.java b/android/app/src/main/java/com/zeus/LndMobileScheduledSyncWorker.java
index 53d88a90f..d1405a37b 100644
--- a/android/app/src/main/java/com/zeus/LndMobileScheduledSyncWorker.java
+++ b/android/app/src/main/java/com/zeus/LndMobileScheduledSyncWorker.java
@@ -218,7 +218,10 @@ public void handleMessage(Message msg) {
                         // Hyperlog.i(TAG, "Got WalletState.RPC_ACTIVE");
                         // Hyperlog.i(TAG, "LndMobileService reports RPC server ready. Sending GetInfo request");
                         getInfoRequest();
-                      } else if (currentState == lnrpc.Stateservice.WalletState.SERVER_ACTIVE) {
+                      } else if (
+                        currentState == lnrpc.Stateservice.WalletState.SERVER_ACTIVE ||
+                        currentState == lnrpc.Stateservice.WalletState.WAITING_TO_START
+                      ) {
                         // Hyperlog.i(TAG, "Got WalletState.SERVER_ACTIVE");
                         // Hyperlog.i(TAG, "We do not care about that.");
                       } else  {
diff --git a/android/app/src/main/java/com/zeus/LndMobileService.java b/android/app/src/main/java/com/zeus/LndMobileService.java
index 55e669a43..71c213de5 100644
--- a/android/app/src/main/java/com/zeus/LndMobileService.java
+++ b/android/app/src/main/java/com/zeus/LndMobileService.java
@@ -548,9 +548,9 @@ public IBinder onBind(Intent intent) {
   @Override
   public boolean onUnbind(Intent intent) {
     if (mClients.isEmpty()) {
-      if (checkLndProcessExists()) {
-        stopLnd(null, -1);
-      }
+      // HyperLog.i(TAG, "Last client unbound. Stopping lnd.");
+      stopLnd(null, -1);
+      stopSelf();
     }
 
     return false;