diff --git a/ChangeLog b/ChangeLog
index f5cfc890b..e054174ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-30  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-effect.c:
+	(clutter_effect_closure_destroy): Do not remove the actor
+	from the behaviour; the behaviour is an internal detail of the
+	effect, and it will remove the actors anyway when finalized
+	when g_object_unref() is called. This should guard against
+	actors being destroyed while an effect is running.
+
 2008-04-30  Øyvind Kolås  <pippin@o-hand.com>
 
 	* clutter/cogl/common/Makefile.am:
diff --git a/clutter/clutter-effect.c b/clutter/clutter-effect.c
index eac586f50..fa8a7bef5 100644
--- a/clutter/clutter-effect.c
+++ b/clutter/clutter-effect.c
@@ -484,7 +484,6 @@ static void
 clutter_effect_closure_destroy (ClutterEffectClosure *c)
 {
   g_signal_handler_disconnect (c->timeline, c->signal_id);
-  clutter_behaviour_remove (c->behave, c->actor);
 
   g_object_unref (c->actor);
   g_object_unref (c->template);