diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 890e95d0ff..52906a03ea 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1045,6 +1045,8 @@ public class Helper {
                 Log.i("Refreshing token");
                 am.invalidateAuthToken(type, current);
                 String refreshed = am.blockingGetAuthToken(account, getAuthTokenType(type), true);
+                if (refreshed == null)
+                    throw new OperationCanceledException("no token");
                 Log.i("Refreshed token");
                 return refreshed;
             }