diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index a37c0d64..b05a0131 100644
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index df0cf839..394e2cb2 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/modules_meshcmd/amt-mei.js b/agents/modules_meshcmd/amt-mei.js
index f9541abc..fc481719 100644
--- a/agents/modules_meshcmd/amt-mei.js
+++ b/agents/modules_meshcmd/amt-mei.js
@@ -456,7 +456,7 @@ function amt_heci()
         for (var i = 4; i < arguments.length; ++i) { optional.push(arguments[i]); }
 
         // Format the command
-        var data = Buffer.alloc(1 + 64 + 4 + 4 + 320);
+        var data = Buffer.alloc(1 + 64 + 4 + 4 + ((dnsSuffixList != null) ? 320 : 0));
         data[0] = (certHash.length == 48) ? 3 : 2 // Write certificate hash type: SHA256 = 2, SHA384 = 3
         certHash.copy(data, 1); // Write the hash
         data.writeUInt32LE(hostVpn ? 1 : 0, 65); // Write is HostVPN is enabled
diff --git a/agents/modules_meshcore/amt-mei.js b/agents/modules_meshcore/amt-mei.js
index f9541abc..fc481719 100644
--- a/agents/modules_meshcore/amt-mei.js
+++ b/agents/modules_meshcore/amt-mei.js
@@ -456,7 +456,7 @@ function amt_heci()
         for (var i = 4; i < arguments.length; ++i) { optional.push(arguments[i]); }
 
         // Format the command
-        var data = Buffer.alloc(1 + 64 + 4 + 4 + 320);
+        var data = Buffer.alloc(1 + 64 + 4 + 4 + ((dnsSuffixList != null) ? 320 : 0));
         data[0] = (certHash.length == 48) ? 3 : 2 // Write certificate hash type: SHA256 = 2, SHA384 = 3
         certHash.copy(data, 1); // Write the hash
         data.writeUInt32LE(hostVpn ? 1 : 0, 65); // Write is HostVPN is enabled