diff --git a/app/index.js b/app/index.js
index dc141b5d..aa51e29b 100644
--- a/app/index.js
+++ b/app/index.js
@@ -146,7 +146,7 @@ app.on('ready', () => {
 
     rpc.on('new', ({ rows = 40, cols = 100, cwd = process.env.HOME }) => {
       const shell = cfg.shell;
-      const shellArgs = Array.from(cfg.shellArgs);
+      const shellArgs = cfg.shellArgs && Array.from(cfg.shellArgs);
 
       initSession({ rows, cols, cwd, shell, shellArgs }, (uid, session) => {
         sessions.set(uid, session);