diff --git a/src/core/display-private.h b/src/core/display-private.h
index e9410dfad..8a18ffd83 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -369,7 +369,6 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
                                              MetaCursor   cursor);
 
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
-                                          MetaScreen  *screen,
                                           MetaGrabOp   op,
                                           guint32      timestamp);
 
diff --git a/src/core/display.c b/src/core/display.c
index 68daad6ae..41fe46cb2 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1724,13 +1724,12 @@ meta_cursor_for_grab_op (MetaGrabOp op)
 
 void
 meta_display_set_grab_op_cursor (MetaDisplay *display,
-                                 MetaScreen  *screen,
                                  MetaGrabOp   op,
                                  guint32      timestamp)
 {
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (display->screen);
   MetaCursor cursor = meta_cursor_for_grab_op (op);
   MetaCursorReference *cursor_ref;
 
@@ -1740,8 +1739,6 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
   XISetMask (mask.mask, XI_Leave);
   XISetMask (mask.mask, XI_Motion);
 
-  g_assert (screen != NULL);
-
   meta_error_trap_push (display);
   if (XIGrabDevice (display->xdisplay,
                     META_VIRTUAL_CORE_POINTER_ID,
@@ -1827,7 +1824,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   if (pointer_already_grabbed)
     display->grab_have_pointer = TRUE;
 
-  meta_display_set_grab_op_cursor (display, screen, op, timestamp);
+  meta_display_set_grab_op_cursor (display, op, timestamp);
 
   if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
     {
diff --git a/src/core/window.c b/src/core/window.c
index 2f2d45937..9e329671d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8102,7 +8102,6 @@ meta_window_update_keyboard_resize (MetaWindow *window,
   if (update_cursor)
     {
       meta_display_set_grab_op_cursor (window->display,
-                                       window->screen,
                                        window->display->grab_op,
                                        window->display->grab_timestamp);
     }