diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 2ac606a4e2646192b831c32e75f51b10ba33e39f..8c3b5d717dc6c0c1ee6feffa9cd18dd9b97e2c24 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -288,6 +288,7 @@
     "if karabo_da[0] == '-1':\n",
     "    if modules[0] == -1:\n",
     "        modules = list(range(nmods))\n",
+    "    mod_indices = modules if nmods > 1 else [0]\n",
     "    karabo_da = [\"AGIPD{:02d}\".format(i) for i in modules]\n",
     "else:  # TODO: fix this with the new CALCAT metadata for module indices.\n",
     "    modules = [int(x[-2:]) for x in karabo_da]\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index ca300e76420b582b56165f3491d4e4027ef571b4..41d7ff28d6e9b3a3880ef615015d371cfb7b2eb3 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -168,6 +168,7 @@
     "if karabo_da[0] == '-1':\n",
     "    if modules[0] == -1:\n",
     "        modules = list(range(nmods))\n",
+    "    mod_indices = modules if nmods > 1 else [0]\n",
     "    karabo_da = create_karabo_da_list(modules)\n",
     "else:\n",
     "    # TODO: use CALCAT metadata for detector's modules indices.\n",