diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java b/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java
index a786ed07..ae0a1e2c 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java
@@ -30,7 +30,9 @@ class S3ClientFactory {
 		}
 
 		AmazonS3Client client = new AmazonS3Client(new BasicAWSCredentials(decrypt(cloud.accessKey(), context), decrypt(cloud.secretKey(), context)), region);
-		client.setEndpoint(cloud.s3Endpoint());
+		if (cloud.s3Endpoint() != null) {
+			client.setEndpoint(cloud.s3Endpoint());
+		}
 		return client;
 	}