diff --git a/cmd/cloudshell/config.go b/cmd/cloudshell/config.go
index 3d6eb99..407f747 100644
--- a/cmd/cloudshell/config.go
+++ b/cmd/cloudshell/config.go
@@ -15,7 +15,7 @@ var conf = config.Map{
 		Shorthand: "H",
 	},
 	"arguments": &config.StringSlice{
-		Default:   []string{"-l"},
+		Default:   []string{},
 		Usage:     "comma-delimited list of arguments that should be passed to the terminal command",
 		Shorthand: "r",
 	},
diff --git a/pkg/xtermjs/handler_websocket.go b/pkg/xtermjs/handler_websocket.go
index 012c27b..eff8e74 100644
--- a/pkg/xtermjs/handler_websocket.go
+++ b/pkg/xtermjs/handler_websocket.go
@@ -134,7 +134,7 @@ func GetHandler(opts HandlerOpts) func(http.ResponseWriter, *http.Request) {
 				messageType, reader, err := connection.NextReader()
 				if err != nil {
 					if !connectionClosed {
-						clog.Warn("failed to get next reader: %s", err)
+						clog.Warnf("failed to get next reader: %s", err)
 					}
 					return
 				}
diff --git a/pkg/xtermjs/utils.go b/pkg/xtermjs/utils.go
index 254aab9..67484a4 100644
--- a/pkg/xtermjs/utils.go
+++ b/pkg/xtermjs/utils.go
@@ -26,7 +26,8 @@ func getConnectionUpgrader(
 			logger.Warnf("failed to find '%s' in the list of allowed hostnames ('%s')", requesterHostname)
 			return false
 		},
-		ReadBufferSize:  maxBufferSizeBytes,
-		WriteBufferSize: maxBufferSizeBytes,
+		HandshakeTimeout: 0,
+		ReadBufferSize:   maxBufferSizeBytes,
+		WriteBufferSize:  maxBufferSizeBytes,
 	}
 }