diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index 65afa466377bd4b23bfbf8500bb1b104f5d4c95b..f9f57a7943b5e8ffcf7ee5ebb3b94c5ff240c27b 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -207,25 +207,6 @@
     "print(f\"Number of memory cells are {memory_cells}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Validate selected cell_id_preview\n",
-    "cell_idx_preview = None\n",
-    "if memory_cells == 1:\n",
-    "    cell_idx_preview = 0\n",
-    "    if cell_id_preview != sc_start:\n",
-    "        print(f\"WARNING: The selected cell_id_preview {cell_id_preview} is not available, \"\n",
-    "              f\"switching to cell `{sc_start}` to preview.\")\n",
-    "        cell_id_preview = sc_start\n",
-    "elif cell_id_preview > 15:\n",
-    "    raise ValueError(\n",
-    "        f\"Selected cell_id_preview: {cell_id_preview} is greater than expected 16 memory cells.\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -470,7 +451,15 @@
     "\n",
     "        if memory_cells > 1:\n",
     "            # For plotting, assuming that memory cells are sorted the same for all trains.\n",
-    "            cell_idx_preview = np.where(memcells[0] == cell_id_preview)[0][0]\n",
+    "            found_cells = memcells[0] == cell_id_preview\n",
+    "            if any(found_cells):\n",
+    "                cell_idx_preview = np.where(found_cells)[0][0]\n",
+    "            else:\n",
+    "                print(f\"WARNING: The selected cell_id_preview {cell_id_preview} is not available in burst mode.\"\n",
+    "                f\"Previewing cell `{memcells[0]}`.\")\n",
+    "                cell_idx_preview = 0\n",
+    "        else:\n",
+    "            cell_idx_preview = 0\n",
     "\n",
     "        rim_data[local_karabo_da] = data[:plt_images, cell_idx_preview, ...].copy()\n",
     "\n",