diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index 016bdc2f0..12a512f35 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -885,8 +885,11 @@ clutter_event_get_device (const ClutterEvent *event)
     case CLUTTER_DESTROY_NOTIFY:
     case CLUTTER_CLIENT_MESSAGE:
     case CLUTTER_DELETE:
+      break;
+
     case CLUTTER_ENTER:
     case CLUTTER_LEAVE:
+      device = event->crossing.device;
       break;
 
     case CLUTTER_BUTTON_PRESS: