diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
index b30a359d191ce..cb0b6a5841936 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
@@ -358,7 +358,7 @@ private static <K, V> Map<K, V> stringToMap(String strValue, Class<K> keyType, C
         String[] tokens = trim(strValue).split(",");
         Map<K, V> map = new HashMap<>();
         for (String token : tokens) {
-            String[] keyValue = trim(token).split("=");
+            String[] keyValue = trim(token).split("=", 2);
             checkArgument(keyValue.length == 2,
                     strValue + " map-value is not in correct format key1=value,key2=value2");
             map.put(convert(trim(keyValue[0]), keyType), convert(trim(keyValue[1]), valueType));
diff --git a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
index b22170fa46505..1f9a1e2688267 100644
--- a/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
+++ b/pulsar-common/src/test/java/org/apache/pulsar/common/util/FieldParserTest.java
@@ -95,6 +95,18 @@ public static class MyConfig {
         public Set<String> stringSet;
     }
 
+    @Test
+    public void testMapWithEqualsSignAndEmptyValue() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("stringStringMap", "key1=value=1,key2=");
+
+        MyConfig config = new MyConfig();
+        FieldParser.update(properties, config);
+
+        assertEquals(config.stringStringMap.get("key1"), "value=1");
+        assertEquals(config.stringStringMap.get("key2"), "");
+    }
+
     @Test
     public void testNullStrValue() throws Exception {
         class TestMap {