diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java
index a7508e622..f303ba75f 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java
@@ -114,7 +114,7 @@ class CryptoWritableFile implements WritableFile {
 				// TODO append padding
 			}
 		} catch (ExecutionException e) {
-			if (e.getCause() instanceof UncheckedIOException) {
+			if (e.getCause() instanceof UncheckedIOException || e.getCause() instanceof IOException) {
 				throw new UncheckedIOException(new IOException(e));
 			} else {
 				throw new IllegalStateException("Unexpected exception while waiting for encrypted file to be written", e);