diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc
index f99291294..3158f6df2 100644
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@@ -1057,6 +1057,16 @@ bool runtime_create_listener(Service* service,
         proto = "mariadbclient";
     }
 
+    if (auth && strcasecmp(auth, CN_DEFAULT) == 0)
+    {
+        // The protocol default authenticator is used
+        auth = nullptr;
+    }
+    if (auth_opt && strcasecmp(auth_opt, CN_DEFAULT) == 0)
+    {
+        auth_opt = nullptr;
+    }
+
     MXS_CONFIG_PARAMETER params;
     bool ok;
     tie(ok, params) = load_defaults(proto, MODULE_PROTOCOL, CN_LISTENER);