diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index 3333db498..f25528498 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -282,6 +282,7 @@ public class VaultListController implements FxController {
 				vaultListManager.addVault(preparedVault);
 				dialogs.prepareRecoveryVaultAdded(mainWindow, preparedVault.getDisplayName()).setOkAction(Stage::close).build().showAndWait();
 			}
+			default -> LOG.warn("Unhandled vault state during recovery: {}", preparedVault.getState());
 		}
 
 	}
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
index 235e530b8..db39ba97a 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java
@@ -153,6 +153,7 @@ public class RecoveryKeyOnboardingController implements FxController {
 				}
 			}
 			case RESTORE_MASTERKEY -> window.setScene(recoverykeyRecoverScene.get());
+			default -> window.setScene(recoverykeyRecoverScene.get()); // Fallback
 		}
 		window.centerOnScreen();
 	}
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index b5b448239..7d2b72fb0 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -101,6 +101,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 		switch (recoverType.get()) {
 			case RESTORE_MASTERKEY, RESTORE_ALL -> nextButton.setText(resourceBundle.getString("recoveryKey.recover.recoverBtn"));
 			case RESET_PASSWORD -> nextButton.setText(resourceBundle.getString("recoveryKey.recover.resetBtn"));
+			default -> nextButton.setText(resourceBundle.getString("recoveryKey.recover.recoverBtn")); // Fallback
 		}
 	}
 
@@ -118,6 +119,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 		switch (recoverType.get()) {
 			case RESTORE_ALL -> restorePassword();
 			case RESTORE_MASTERKEY, RESET_PASSWORD -> resetPassword();
+			default -> resetPassword(); // Fallback
 		}
 	}
 
@@ -163,6 +165,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 			switch (recoverType.get()){
 				case RESET_PASSWORD -> dialogs.prepareRecoverPasswordSuccess(window).build().showAndWait();
 				case RESTORE_MASTERKEY -> dialogs.prepareRecoverPasswordSuccess(window).setTitleKey("recover.recoverMasterkey.title").setMessageKey("recoveryKey.recover.resetMasterkeyFileSuccess.message").build().showAndWait();
+				default -> dialogs.prepareRecoverPasswordSuccess(window).build().showAndWait(); // Fallback
 			}
 		});