diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c
index 236ca9075..adb80a454 100644
--- a/clutter/clutter-state.c
+++ b/clutter/clutter-state.c
@@ -1969,8 +1969,13 @@ clutter_state_get_duration (ClutterState *state,
   if (target_state != NULL)
     {
       if (source_state_name)
-        ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations,
-                                                    source_state_name));
+        {
+          ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations,
+                                                      source_state_name));
+          if(!ret)
+            ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations,
+                                                        NULL));
+        }
       else
         ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations,
                                                     NULL));