diff --git a/client/displayservers/Wayland/wayland.c b/client/displayservers/Wayland/wayland.c
index bcc5895c..5bbe7c0c 100644
--- a/client/displayservers/Wayland/wayland.c
+++ b/client/displayservers/Wayland/wayland.c
@@ -125,7 +125,8 @@ static void pointerMotionHandler(void * data, struct wl_pointer * pointer,
 {
   int sx = wl_fixed_to_int(sxW);
   int sy = wl_fixed_to_int(syW);
-  app_handleMouseNormal(sx, sy);
+  app_updateCursorPos(sx, sy);
+  app_handleMouseBasic();
 }
 
 static void pointerEnterHandler(void * data, struct wl_pointer * pointer,
@@ -134,7 +135,8 @@ static void pointerEnterHandler(void * data, struct wl_pointer * pointer,
 {
   int sx = wl_fixed_to_int(sxW);
   int sy = wl_fixed_to_int(syW);
-  app_handleMouseNormal(sx, sy);
+  app_updateCursorPos(sx, sy);
+  app_handleMouseBasic();
 }
 
 static void pointerLeaveHandler(void * data, struct wl_pointer * pointer,
@@ -394,13 +396,7 @@ static bool waylandEventFilter(SDL_Event * event)
   switch(event->type)
   {
     case SDL_MOUSEMOTION:
-    {
-      app_updateCursorPos(event->motion.x, event->motion.y);
-
-      // we must use the basic handler as Wayland has no warp support
-      app_handleMouseBasic(event->motion.x, event->motion.y);
       return true;
-    }
   }
 
   return false;
diff --git a/client/include/app.h b/client/include/app.h
index e6b4ae6f..548086b4 100644
--- a/client/include/app.h
+++ b/client/include/app.h
@@ -34,9 +34,9 @@ void app_updateWindowPos(int x, int y);
 void app_handleResizeEvent(int w, int h);
 void app_handleMouseGrabbed(double ex, double ey);
 void app_handleMouseNormal(double ex, double ey);
-void app_handleMouseBasic(double ex, double ey);
-void app_handleWindowEnter();
-void app_handleWindowLeave();
+void app_handleMouseBasic(void);
+void app_handleWindowEnter(void);
+void app_handleWindowLeave(void);
 
 void app_clipboardRelease(void);
 void app_clipboardNotify(const LG_ClipboardData type, size_t size);
diff --git a/client/src/main.c b/client/src/main.c
index dda20544..881354f9 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -1103,16 +1103,8 @@ void app_handleMouseNormal(double ex, double ey)
 // cursor warp support. Instead, we attempt a best-effort emulation which works
 // with a 1:1 mouse movement patch applied in the guest. For anything fancy, use
 // capture mode.
-void app_handleMouseBasic(double ex, double ey)
+void app_handleMouseBasic()
 {
-  /* if we don't have the current cursor pos just send cursor movements */
-  if (!g_cursor.guest.valid)
-  {
-    if (g_cursor.grab)
-      app_handleMouseGrabbed(ex, ey);
-    return;
-  }
-
   const bool inView =
     g_cursor.pos.x >= g_state.dstRect.x                     &&
     g_cursor.pos.x <  g_state.dstRect.x + g_state.dstRect.w &&