diff --git a/api/src/main/java/ai/djl/BaseModel.java b/api/src/main/java/ai/djl/BaseModel.java
index ecb39c104dc..4b2478d9a80 100644
--- a/api/src/main/java/ai/djl/BaseModel.java
+++ b/api/src/main/java/ai/djl/BaseModel.java
@@ -228,6 +228,9 @@ protected Block loadFromBlockFactory() {
     /** {@inheritDoc} */
     @Override
     public void save(Path modelPath, String newModelName) throws IOException {
+        if (newModelName == null || newModelName.isEmpty()) {
+            newModelName = modelName;
+        }
         if (Files.notExists(modelPath)) {
             Files.createDirectories(modelPath);
         }