diff --git a/lib/actions/sessions.js b/lib/actions/sessions.js
index 5ef84fb3..07265584 100644
--- a/lib/actions/sessions.js
+++ b/lib/actions/sessions.js
@@ -53,22 +53,23 @@ export function addSessionData(uid, data) {
       type: SESSION_ADD_DATA,
       data,
       effect() {
-        const {shell} = getState().sessions.sessions[uid];
-        const enterKey = data.indexOf('\n') > 0;
-        const url = enterKey ? isUrl(shell, data) : null;
-        if (url) {
-          dispatch({
-            type: SESSION_URL_SET,
-            uid,
-            url
-          });
-        } else {
-          dispatch({
-            type: SESSION_PTY_DATA,
-            uid,
-            data
-          });
+        const session = getState().sessions.sessions[uid];
+        if (session) {
+          const enterKey = data.indexOf('\n') > 0;
+          const url = enterKey ? isUrl(session.shell, data) : null;
+          if (url) {
+            return dispatch({
+              type: SESSION_URL_SET,
+              uid,
+              url
+            });
+          }
         }
+        dispatch({
+          type: SESSION_PTY_DATA,
+          uid,
+          data
+        });
       }
     });
   };