diff --git a/meshctrl.js b/meshctrl.js
index d79b2b8b..e2d62919 100644
--- a/meshctrl.js
+++ b/meshctrl.js
@@ -2242,7 +2242,7 @@ function serverConnect() {
             case 'removeuserfromusergroup':
             case 'removeDeviceShare':
             case 'userbroadcast': { // BROADCAST
-                if ((settings.cmd == 'shell') || (settings.cmd == 'upload') || (settings.cmd == 'download')) return;
+                if (((settings.cmd == 'shell') || (settings.cmd == 'upload') || (settings.cmd == 'download')) && (data.result == 'OK')) return;
                 if ((data.type == 'runcommands') && (settings.cmd != 'runcommand')) return;
                 if ((settings.multiresponse != null) && (settings.multiresponse > 1)) { settings.multiresponse--; break; }
                 if (data.responseid == 'meshctrl') {