diff --git a/ChangeLog b/ChangeLog
index 331b8daa35..c98bcbe5eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-18  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/schedulers/entryscheduler.c: (gst_entry_scheduler_reset):
+	  make resetting scheduler work twice in a row
+
 2004-05-18  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/gstvalue.c: (gst_strtoll), (CREATE_SERIALIZATION),
diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c
index d9dff85ccd..10dfcbee6d 100644
--- a/gst/schedulers/entryscheduler.c
+++ b/gst/schedulers/entryscheduler.c
@@ -756,8 +756,10 @@ gst_entry_scheduler_reset (GstScheduler * sched)
   }
 #endif
 
-  do_cothread_context_destroy (GST_ENTRY_SCHEDULER (sched)->context);
-  GST_ENTRY_SCHEDULER (sched)->context = NULL;
+  if (GST_ENTRY_SCHEDULER (sched)->context) {
+    do_cothread_context_destroy (GST_ENTRY_SCHEDULER (sched)->context);
+    GST_ENTRY_SCHEDULER (sched)->context = NULL;
+  }
 }
 
 static CothreadPrivate *