diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index d5de1f0be1c14..7951fb71b084d 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -923,7 +923,7 @@ public class WifiService extends IWifiManager.Stub {
                 String value = field.value();
                 if (value != null) {
                     if (field != config.eap) {
-                        value = convertToQuotedString(value);
+                        value = (value.length() == 0) ? "NULL" : convertToQuotedString(value);
                     }
                     if (!WifiNative.setNetworkVariableCommand(
                                 netId,