diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index a3214f38f4c..d326cbca700 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -269,8 +269,12 @@ public class RpcClient implements ClientProtocol, KeyProviderTokenIssuer {
       builder.addOzoneAcls(OMPBHelper.convertOzoneAcl(ozoneAcl));
     }
 
-    LOG.info("Creating Volume: {}, with {} as owner and quota set to {} bytes.",
-        volumeName, owner, quota);
+    if (volArgs.getQuota() == null) {
+      LOG.info("Creating Volume: {}, with {} as owner.", volumeName, owner);
+    } else {
+      LOG.info("Creating Volume: {}, with {} as owner "
+              + "and quota set to {} bytes.", volumeName, owner, quota);
+    }
     ozoneManagerClient.createVolume(builder.build());
   }