diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index e2a98ab5a6..756a03b6b5 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -83,9 +83,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$result = $this->connection->createBucket(array(
 				'Bucket' => $this->bucket
 			));
-			$this->connection->waitUntilBucketExists(array(
-				'Bucket' => $this->bucket
-			));
+			sleep(5);
 		}
 
 		if ( ! $this->file_exists('.')) {
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index 8dcd386341..15bf9b1477 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -59,9 +59,7 @@ class AmazonS3 extends Storage {
 				'Bucket' => $this->config['amazons3']['bucket']
 			));
 
-			$connection->waitUntilBucketNotExists(array(
-				'Bucket' => $this->config['amazons3']['bucket']
-			));
+			sleep(5);
 		}
 	}
 }