diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
index 8a8ec3444..ba4407c39 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
@@ -19,6 +19,9 @@ public class UpgradeStrategies {
 	}
 
 	public Optional<UpgradeStrategy> getUpgradeStrategy(Vault vault) {
+		if (vault == null) {
+			return Optional.empty();
+		}
 		return strategies.stream().filter(strategy -> {
 			return strategy.isApplicable(vault);
 		}).findFirst();