diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 375b69d9f..769463bf4 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -1395,6 +1395,9 @@ clutter_device_manager_xi2_get_core_device (ClutterDeviceManager   *manager,
   switch (device_type)
     {
     case CLUTTER_POINTER_DEVICE:
+      if (manager_xi2->client_pointer == NULL)
+        update_client_pointer (manager_xi2);
+
       return manager_xi2->client_pointer;
 
     case CLUTTER_KEYBOARD_DEVICE: