diff --git a/wavesrv/pkg/remote/remote.go b/wavesrv/pkg/remote/remote.go
index 987e270ab..e6e82bac6 100644
--- a/wavesrv/pkg/remote/remote.go
+++ b/wavesrv/pkg/remote/remote.go
@@ -74,14 +74,7 @@ const PrintPingPacket = `printf "\n##N{\"type\": \"ping\"}\n"`
 
 const MShellServerCommandFmt = `
 PATH=$PATH:~/.mshell;
-which mshell-[%VERSION%] > /dev/null;
-if [[ "$?" -ne 0 ]]
-then
-  printf "\n##N{\"type\": \"init\", \"notfound\": true, \"uname\": \"%s | %s\"}\n" "$(uname -s)" "$(uname -m)"
-else
-  [%PINGPACKET%]
-  mshell-[%VERSION%] --server
-fi
+mshell-[%VERSION%] --server 2> /dev/null || printf "\n##N{\"type\": \"init\", \"notfound\": true, \"uname\": \"%s | %s\"}\n" "$(uname -s)" "$(uname -m)"
 `
 
 func MakeLocalMShellCommandStr(isSudo bool) (string, error) {