diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
index 34b7b373d..17c821997 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
@@ -101,6 +101,8 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 
 	@Override
 	public void stopService() {
+		timeoutMinutes = timeoutNever;
+		if (alarmSet) alarmManager.cancel(lockIntent);
 	}
 
 	@UiThread