diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs
index 636e0ea..c16cec1 100644
--- a/Plugins/Plugin/MyMqttClient.cs
+++ b/Plugins/Plugin/MyMqttClient.cs
@@ -50,7 +50,7 @@ namespace Plugin
                 #region ClientOptions
                 // Setup and start a managed MQTT client.
                 _options = new MqttClientOptionsBuilder()
-                    .WithClientId(_systemConfig.ClientId ?? Guid.NewGuid().ToString())
+                    .WithClientId(string.IsNullOrEmpty(_systemConfig.ClientId) ? Guid.NewGuid().ToString():_systemConfig.ClientId)
                     .WithTcpServer(_systemConfig.MqttIp, _systemConfig.MqttPort)
                     .WithCredentials(_systemConfig.MqttUName, _systemConfig.MqttUPwd)
                     .WithTimeout(TimeSpan.FromSeconds(30))