diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
index db74fb49b78..5cd68a07107 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
@@ -93,6 +93,11 @@ public long calculateChunkSize(long length) {
             parts = (int)(length / partSize);
          }
       }
+      if (partSize > maximumPartSize) {
+         partSize = maximumPartSize;
+         unitPartSize = maximumPartSize;
+         parts = (int)(length / unitPartSize);
+      }
       if (parts > maximumNumberOfParts) { // if splits in too many parts or
                                          // cannot be split
          unitPartSize = minimumPartSize; // take the minimum part size