diff --git a/clutter/clutter/clutter-frame-clock.c b/clutter/clutter/clutter-frame-clock.c
index e4d0fb98a..fccc55aca 100644
--- a/clutter/clutter/clutter-frame-clock.c
+++ b/clutter/clutter/clutter-frame-clock.c
@@ -632,10 +632,9 @@ clutter_frame_clock_schedule_update_now (ClutterFrameClock *frame_clock)
     {
     case CLUTTER_FRAME_CLOCK_STATE_INIT:
     case CLUTTER_FRAME_CLOCK_STATE_IDLE:
+    case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED:
       next_update_time_us = g_get_monotonic_time ();
       break;
-    case CLUTTER_FRAME_CLOCK_STATE_SCHEDULED:
-      return;
     case CLUTTER_FRAME_CLOCK_STATE_DISPATCHING:
     case CLUTTER_FRAME_CLOCK_STATE_PENDING_PRESENTED:
       frame_clock->pending_reschedule = TRUE;
diff --git a/src/tests/clutter/conform/frame-clock.c b/src/tests/clutter/conform/frame-clock.c
index e5b58f182..d82c70799 100644
--- a/src/tests/clutter/conform/frame-clock.c
+++ b/src/tests/clutter/conform/frame-clock.c
@@ -430,6 +430,7 @@ schedule_update_now_hw_callback (gpointer user_data)
   UpdateNowFrameClockTest *test = user_data;
   ClutterFrameClock *frame_clock = test->base.fake_hw_clock->frame_clock;
 
+  clutter_frame_clock_schedule_update (frame_clock);
   clutter_frame_clock_schedule_update_now (frame_clock);
   g_assert (!test->idle_source_id);
   test->idle_source_id = g_idle_add (assert_not_reached_idle, NULL);