diff --git a/config/thisroot.csh b/config/thisroot.csh
index e706ed5cacb87..ccfd935f13b60 100644
--- a/config/thisroot.csh
+++ b/config/thisroot.csh
@@ -161,6 +161,14 @@ if ($?old_rootsys) then
                                  -e "s;^$old_rootsys/etc/notebook:;;g"   \
                                  -e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
    endif
+   # Potential leftovers from future ROOT > v6.34
+   if ($?JUPYTER_CONFIG_PATH) then
+      setenv JUPYTER_CONFIG_PATH `set DOLLAR='$'; echo $JUPYTER_CONFIG_PATH | \
+                             sed -e "s;:$old_rootsys/etc/notebook:;:;g" \
+                                 -e "s;:$old_rootsys/etc/notebook${DOLLAR};;g"   \
+                                 -e "s;^$old_rootsys/etc/notebook:;;g"   \
+                                 -e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
+   endif
 
 endif
 
diff --git a/config/thisroot.sh b/config/thisroot.sh
index 8278dd3bbb3f4..d3d97c4181f22 100644
--- a/config/thisroot.sh
+++ b/config/thisroot.sh
@@ -78,6 +78,11 @@ clean_environment()
          drop_from_path "$JUPYTER_CONFIG_DIR" "${old_rootsys}/etc/notebook"
          JUPYTER_CONFIG_DIR=$newpath
       fi
+      # Potential leftovers from future ROOT > v6.34
+      if [ -n "${JUPYTER_CONFIG_PATH-}" ]; then
+         drop_from_path "$JUPYTER_CONFIG_PATH" "${old_rootsys}/etc/notebook"
+         JUPYTER_CONFIG_PATH=$newpath
+      fi
    fi
    if [ -z "${MANPATH-}" ]; then
       # Grab the default man path before setting the path to avoid duplicates