diff --git a/llama_stack/distribution/ui/page/distribution/datasets.py b/llama_stack/distribution/ui/page/distribution/datasets.py
index 44e314cde..b52356522 100644
--- a/llama_stack/distribution/ui/page/distribution/datasets.py
+++ b/llama_stack/distribution/ui/page/distribution/datasets.py
@@ -14,6 +14,6 @@ def datasets():
     datasets_info = {
         d.identifier: d.to_dict() for d in llama_stack_api.client.datasets.list()
     }
-
-    selected_dataset = st.selectbox("Select a dataset", list(datasets_info.keys()))
-    st.json(datasets_info[selected_dataset], expanded=True)
+    if len(datasets_info) > 0:
+        selected_dataset = st.selectbox("Select a dataset", list(datasets_info.keys()))
+        st.json(datasets_info[selected_dataset], expanded=True)
diff --git a/llama_stack/distribution/ui/page/distribution/eval_tasks.py b/llama_stack/distribution/ui/page/distribution/eval_tasks.py
index 4957fb178..cc7912838 100644
--- a/llama_stack/distribution/ui/page/distribution/eval_tasks.py
+++ b/llama_stack/distribution/ui/page/distribution/eval_tasks.py
@@ -16,7 +16,8 @@ def eval_tasks():
         d.identifier: d.to_dict() for d in llama_stack_api.client.eval_tasks.list()
     }
 
-    selected_eval_task = st.selectbox(
-        "Select an eval task", list(eval_tasks_info.keys()), key="eval_task_inspect"
-    )
-    st.json(eval_tasks_info[selected_eval_task], expanded=True)
+    if len(eval_tasks_info) > 0:
+        selected_eval_task = st.selectbox(
+            "Select an eval task", list(eval_tasks_info.keys()), key="eval_task_inspect"
+        )
+        st.json(eval_tasks_info[selected_eval_task], expanded=True)