diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
index 8e3ec1539..f7d0cb5cf 100644
--- a/glib/deprecated/gthread-deprecated.c
+++ b/glib/deprecated/gthread-deprecated.c
@@ -1551,6 +1551,12 @@ g_cond_timed_wait (GCond    *cond,
 {
   gint64 end_time;
 
+  if (abs_time == NULL)
+    {
+      g_cond_wait (cond, mutex);
+      return TRUE;
+    }
+
   end_time = abs_time->tv_sec;
   end_time *= 1000000;
   end_time += abs_time->tv_usec;