diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs
index e88fe63..cc062ce 100644
--- a/Plugins/Plugin/MyMqttClient.cs
+++ b/Plugins/Plugin/MyMqttClient.cs
@@ -56,7 +56,7 @@ namespace Plugin
                     .WithAutoReconnectDelay(TimeSpan.FromSeconds(5))
                     .WithMaxPendingMessages(10000)
                     .WithClientOptions(new MqttClientOptionsBuilder()
-                        .WithClientId(_systemConfig.ClientId ?? Guid.NewGuid().ToString())
+                        .WithClientId(string.IsNullOrWhiteSpace( _systemConfig.ClientId) ? Guid.NewGuid().ToString() : _systemConfig.ClientId)
                         .WithTcpServer(_systemConfig.MqttIp, _systemConfig.MqttPort)
                         .WithCredentials(_systemConfig.MqttUName, _systemConfig.MqttUPwd)
                         .WithTimeout(TimeSpan.FromSeconds(30))