diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 4feebe7a40e57f040dcb8bac6a9e99153c6e1cb2..6277bce91235c56325305efa2134aeee5de21275 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -328,9 +328,13 @@
     "# Evaluate requested modules\n",
     "if karabo_da[0] == '-1':\n",
     "    if modules[0] == -1:\n",
-    "        modules = list(range(nmods))\n",
+    "        modules = np.sort(list(int(key.split('/')[-1].split('CH0:')[0]) for key in dc.detector_sources))\n",
     "    mod_indices = modules if nmods > 1 else [0]\n",
     "    karabo_da = [\"AGIPD{:02d}\".format(i) for i in modules]\n",
+    "    missing_modules = set(range(nmods)) - set(modules)\n",
+    "    if len(missing_modules):\n",
+    "        warning(f\"These modules {missing_modules} are missing from detector sources.\")\n",
+    "\n",
     "else:  # TODO: fix this with the new CALCAT metadata for module indices.\n",
     "    modules = [int(x[-2:]) for x in karabo_da]\n",
     "    mod_indices = modules if nmods > 1 else [0]\n",
@@ -1633,7 +1637,7 @@
  "metadata": {
   "euxfel_not_reproducible_params": ["slopes_ff_from_path"],
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1647,7 +1651,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.11"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,