diff --git a/api/src/main/java/io/minio/PutObjectArgs.java b/api/src/main/java/io/minio/PutObjectArgs.java
index e075f0369..980fba6d4 100644
--- a/api/src/main/java/io/minio/PutObjectArgs.java
+++ b/api/src/main/java/io/minio/PutObjectArgs.java
@@ -93,11 +93,8 @@ private long[] partInfo(long objectSize, long partSize) {
       }
 
       if (partSize > 0) {
-        if (partSize > objectSize) {
-          partSize = objectSize;
-        }
-
-        long partCount = (long) Math.ceil((double) objectSize / partSize);
+        if (partSize > objectSize) partSize = objectSize;
+        long partCount = partSize > 0 ? (long) Math.ceil((double) objectSize / partSize) : 1;
         return new long[] {partSize, partCount == 0 ? 1 : partCount};
       }