diff --git a/girara/datastructures.c b/girara/datastructures.c
index fc21330bfcb68a12e8af522ff61dc763a2b5e65d..42b7f5a0e4e6db2addbf35b47df261b91a249afd 100644
--- a/girara/datastructures.c
+++ b/girara/datastructures.c
@@ -379,7 +379,10 @@ girara_list_sort(girara_list_t* list, girara_compare_function_t compare)
 void
 girara_list_foreach(girara_list_t* list, girara_list_callback_t callback, void* data)
 {
-  g_return_if_fail(list && list->start && callback);
+  g_return_if_fail(list != NULL && callback != NULL);
+  if (list->start == NULL) {
+    return;
+  }
 
   g_list_foreach(list->start, callback, data);
 }