diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
index fbb5646f368..093898ae56c 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
@@ -429,7 +429,7 @@ opts, runOpts, new BytePointer(exportDir), new PointerPointer(tags),
   }
 
   private static void validateTags(String[] tags) {
-    if (tags == null || tags.length == 0 || Arrays.stream(tags).anyMatch(t -> t == null || t.isEmpty())) {
+    if (tags == null || Arrays.stream(tags).anyMatch(t -> t == null || t.isEmpty())) {
       throw new IllegalArgumentException("Invalid tags: " + Arrays.toString(tags));
     }
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
index eabb86f732f..d807d13de00 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
@@ -262,10 +262,7 @@ public void cannotExportMultipleFunctionsWithSameSignatureKey() throws IOExcepti
   @Test
   public void cannotExportOrImportInvalidTags() {
     assertThrows(IllegalArgumentException.class, () ->
-        SavedModelBundle.loader("/").withTags()
-    );
-    assertThrows(IllegalArgumentException.class, () ->
-        SavedModelBundle.loader("/").withTags(new String[]{})
+        SavedModelBundle.loader("/").withTags(null)
     );
     assertThrows(IllegalArgumentException.class, () ->
         SavedModelBundle.loader("/").withTags(new String[]{"tag", null})
@@ -274,10 +271,7 @@ public void cannotExportOrImportInvalidTags() {
         SavedModelBundle.loader("/").withTags(new String[]{"tag", ""})
     );
     assertThrows(IllegalArgumentException.class, () ->
-        SavedModelBundle.exporter("/").withTags()
-    );
-    assertThrows(IllegalArgumentException.class, () ->
-        SavedModelBundle.exporter("/").withTags(new String[]{})
+        SavedModelBundle.exporter("/").withTags(null)
     );
     assertThrows(IllegalArgumentException.class, () ->
         SavedModelBundle.exporter("/").withTags(new String[]{"tag", null})