diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 6d5c6187..ad7eb6a2 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 84617c82..84211fdb 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe
index d7d28346..866ab983 100644
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe
index 5fb54ecb..824da4de 100644
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
diff --git a/apprelays.js b/apprelays.js
index f4142d12..3bc7c2bc 100644
--- a/apprelays.js
+++ b/apprelays.js
@@ -227,8 +227,12 @@ module.exports.CreateMstscRelay = function (parent, db, ws, req, args, domain) {
                             obj.relaynodeid = mesh.relayid;
                             obj.tcpaddr = node.host;
 
+                            // Get the TCP port to use
+                            var tcpport = 3389;
+                            if ((obj.cookie != null) && (obj.cookie.tcpport != null)) { tcpport = obj.cookie.tcpport; } else { if (node.rdpport) { tcpport = node.rdpport } }
+
                             // Re-encode a cookie with a device relay
-                            const cookieContent = { userid: obj.userid, domainid: domain.id, nodeid: mesh.relayid, tcpaddr: node.host, tcpport: obj.cookie.tcpport };
+                            const cookieContent = { userid: obj.userid, domainid: domain.id, nodeid: mesh.relayid, tcpaddr: node.host, tcpport: tcpport };
                             obj.infos.ip = parent.parent.encodeCookie(cookieContent, parent.parent.loginCookieEncryptionKey);
                         } else if (obj.infos.ip.startsWith('node/')) {
                             // Encode a cookie with a device relay
diff --git a/public/scripts/agent-rdp-0.0.1.js b/public/scripts/agent-rdp-0.0.1.js
index 7558f816..afbb8250 100644
--- a/public/scripts/agent-rdp-0.0.1.js
+++ b/public/scripts/agent-rdp-0.0.1.js
@@ -88,6 +88,7 @@ var CreateRDPDesktop = function (canvasid) {
     }
 
     obj.Stop = function () {
+        obj.Canvas.fillRect(0, 0, obj.ScreenWidth, obj.ScreenHeight);
         if (obj.socket) { obj.socket.close(); }
     }