diff --git a/datasafe-storage/datasafe-storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java b/datasafe-storage/datasafe-storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java
index 2c43345b5..bc2bd3c95 100644
--- a/datasafe-storage/datasafe-storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java
+++ b/datasafe-storage/datasafe-storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java
@@ -20,10 +20,14 @@ public String resourceKey(AbsoluteLocation resource) {
         UnaryOperator<String> trimStartingSlash = str -> str.replaceFirst("^/", "");
 
         String resourcePath = trimStartingSlash.apply(resource.location().getRawPath());
-        if (bucketName == null || "".equals(bucketName) || !resourcePath.contains(bucketName)) {
+        if (resourcePath.startsWith("eu-central-1/")) {
+            resourcePath = resourcePath.substring("eu-central-1/".length());
+        }
+
+        if (bucketName == null || "".equals(bucketName) || !resourcePath.startsWith(bucketName)) {
             return resourcePath;
         }
 
-        return trimStartingSlash.apply(resourcePath.substring(resourcePath.indexOf(bucketName) + bucketName.length()));
+        return trimStartingSlash.apply(resourcePath.substring(bucketName.length()));
     }
 }