diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index aeaa247fb..7a5ffe65f 100644
--- a/briar-android/src/org/briarproject/android/BriarService.java
+++ b/briar-android/src/org/briarproject/android/BriarService.java
@@ -136,11 +136,11 @@ public class BriarService extends RoboService implements EventListener {
 		new Thread() {
 			@Override
 			public void run() {
-				androidExecutor.shutdown();
 				if(started) {
 					db.removeListener(BriarService.this);
 					lifecycleManager.stopServices();
 				}
+				androidExecutor.shutdown();
 			}
 		}.start();
 	}