diff --git a/notebooks/01_raw_intro.ipynb b/notebooks/01_raw_intro.ipynb
index 57e1d1087b79e9001eefd77ea0734aaa0a803d69..b65db6e26e5b369e8bbd83407dfdccf9c50ce292 100644
--- a/notebooks/01_raw_intro.ipynb
+++ b/notebooks/01_raw_intro.ipynb
@@ -1635,7 +1635,7 @@
     "\n",
     "count = 0\n",
     "df_images[\"userid\"] = 0 # set default value\n",
-    "for pageid, row in df_images.sample(n=50).iterrows():\n",
+    "for pageid, row in df_images.sample(n=min(50, len(df_images))).iterrows():\n",
     "    params[\"pageids\"] = pageid\n",
     "    try:\n",
     "        response = requests.get(\n",
diff --git a/py/_01_raw_intro.py b/py/_01_raw_intro.py
index 405f928bd23c475c9591fdc186e2d3bf891e4c8b..36676b8e06752e38b84ef06dc0b25ef27cb3c1b4 100644
--- a/py/_01_raw_intro.py
+++ b/py/_01_raw_intro.py
@@ -838,7 +838,7 @@ from datetime import datetime
 
 count = 0
 df_images["userid"] = 0 # set default value
-for pageid, row in df_images.sample(n=50).iterrows():
+for pageid, row in df_images.sample(n=min(50, len(df_images))).iterrows():
     params["pageids"] = pageid
     try:
         response = requests.get(