diff --git a/base-notebook/start-notebook.sh b/base-notebook/start-notebook.sh
index 9d33dbd532..9ceee9203d 100755
--- a/base-notebook/start-notebook.sh
+++ b/base-notebook/start-notebook.sh
@@ -4,19 +4,21 @@
 
 set -e
 
+if [[ -n "${JUPYTERHUB_API_TOKEN}" ]]; then
+    echo "WARNING: using start-singleuser.sh instead of start-notebook.sh to start a server associated with JupyterHub."
+    exec /usr/local/bin/start-singleuser.sh "$@"
+fi
+
 wrapper=""
 if [[ "${RESTARTABLE}" == "yes" ]]; then
     wrapper="run-one-constantly"
 fi
 
-if [[ -n "${JUPYTERHUB_API_TOKEN}" ]]; then
-    # launched by JupyterHub, use single-user entrypoint
-    exec /usr/local/bin/start-singleuser.sh "$@"
-elif [[ -n "${JUPYTER_ENABLE_LAB}" ]]; then
-    # shellcheck disable=SC1091
-    . /usr/local/bin/start.sh ${wrapper} jupyter lab "$@"
+if [[ -n "${JUPYTER_ENABLE_LAB}" ]]; then
+    # shellcheck disable=SC1091,SC2086
+    exec /usr/local/bin/start.sh ${wrapper} ${NOTEBOOK_ARGS} jupyter lab "$@"
 else
-    echo "WARN: Jupyter Notebook deprecation notice https://github.com/jupyter/docker-stacks#jupyter-notebook-deprecation-notice."
-    # shellcheck disable=SC1091
-    . /usr/local/bin/start.sh ${wrapper} jupyter notebook "$@"
+    echo "WARNING: Jupyter Notebook deprecation notice https://github.com/jupyter/docker-stacks#jupyter-notebook-deprecation-notice."
+    # shellcheck disable=SC1091,SC2086
+    exec /usr/local/bin/start.sh ${wrapper} ${NOTEBOOK_ARGS} jupyter notebook "$@"
 fi
diff --git a/base-notebook/test/test_start_container.py b/base-notebook/test/test_start_container.py
index 9d3a858075..d3eec46dd4 100644
--- a/base-notebook/test/test_start_container.py
+++ b/base-notebook/test/test_start_container.py
@@ -33,7 +33,7 @@ def test_start_notebook(container, http_client, env, expected_server):
     ), f"Not the expected command (jupyter {expected_server}) was launched"
     # Checking warning messages
     if not env:
-        msg = "WARN: Jupyter Notebook deprecation notice"
+        msg = "WARNING: Jupyter Notebook deprecation notice"
         assert msg in logs, f"Expected warning message {msg} not printed"