diff --git a/docs/conf.py b/docs/conf.py
index a7e8fc9e3d6..2575d8bb624 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,9 +58,6 @@
     "sphinxcontrib.apidoc",
 ]
 
-if os.getenv('DISABLE_NBSPHINX') == "1":
-    extensions.remove("nbsphinx")
-
 bibtex_bibfiles = ['tardis.bib']
 
 source_suffix = {
@@ -72,7 +69,10 @@
 numpydoc_show_class_members = False
 extensions += ["matplotlib.sphinxext.plot_directive", "sphinxcontrib.bibtex"]
 
-nbsphinx_execute = "auto"
+if os.getenv('DISABLE_NBSPHINX') == "1":
+    nbsphinx_execute = "never"
+else:
+    nbsphinx_execute = "auto"
 
 nbsphinx_execute_arguments = [
     "--InlineBackend.figure_formats={'svg', 'pdf'}",
@@ -82,6 +82,7 @@
 nbsphinx_prolog = """
 This notebook is available at 
 https://github.com/tardis-sn/tardis/tree/master/docs/{{ env.doc2path(env.docname, base=None) }}
+
 ----
 """
 
diff --git a/docs/quickstart/quickstart.ipynb b/docs/quickstart/quickstart.ipynb
index ce7b1ca7572..84242ab73e0 100644
--- a/docs/quickstart/quickstart.ipynb
+++ b/docs/quickstart/quickstart.ipynb
@@ -118,6 +118,7 @@
   }
  ],
  "metadata": {
+  "celltoolbar": "Edit Metadata",
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -133,11 +134,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
-  },
-  "nbsphinx": {
-   "execute": "always",
-   "timeout": -1
+   "version": "3.7.10"
   }
  },
  "nbformat": 4,
diff --git a/docs/using/interaction/custom_source.ipynb b/docs/using/interaction/custom_source.ipynb
index 68aaf50a46d..d3b2c0dfb9e 100644
--- a/docs/using/interaction/custom_source.ipynb
+++ b/docs/using/interaction/custom_source.ipynb
@@ -165,10 +165,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.7.10"
-  },
-  "nbsphinx": {
-   "execute": "always",
-   "timeout": 600
   }
  },
  "nbformat": 4,
diff --git a/docs/using/interaction/physical_quantities.ipynb b/docs/using/interaction/physical_quantities.ipynb
index 92054e5b209..9b883521691 100644
--- a/docs/using/interaction/physical_quantities.ipynb
+++ b/docs/using/interaction/physical_quantities.ipynb
@@ -273,11 +273,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.8"
-  },
-  "nbsphinx": {
-   "execute": "always",
-   "timeout": -1
+   "version": "3.7.10"
   }
  },
  "nbformat": 4,