diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c
index 5c8b1f8c41..b4707c7b36 100644
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@@ -1111,6 +1111,9 @@ eina_list_shuffle(Eina_List *list, Eina_Random_Cb func)
    n = accounting->count;
    shuffled_list = shuffled_last = NULL;
 
+   if (n == 0)
+     return NULL;
+
    if (n == 1)
      return list;