diff --git a/src/shell/lisa_shell b/src/shell/lisa_shell
index 34c8bde8f77b079c5a89c4958d7e6b9d59e12410..6d4633298674a97e2fbb8f7c98507c0aba8259ef 100755
--- a/src/shell/lisa_shell
+++ b/src/shell/lisa_shell
@@ -210,9 +210,14 @@ echo -e "\t${PYTHONPATH//:/\\n\\t}"
 cd $PYDIR
 echo
 echo -n 'Notebook server task: '
-nohup ipython notebook --ip=$IPADDR --port=$PORT \
-                       --NotebookApp.token=$TOKEN \
-                       >$LOGFILE 2>&1 &
+if which ipython >/dev/null; then
+    local cmd=ipython
+else
+    local cmd=jupyter
+fi
+nohup $cmd notebook --ip=$IPADDR --port=$PORT \
+                    --NotebookApp.token=$TOKEN \
+                    >$LOGFILE 2>&1 &
 echo $! >$PIDFILE
 echo $URL >$URLFILE
 cd - >/dev/null