diff --git a/src/wndproc.c b/src/wndproc.c
index 98ce099..f38882c 100644
--- a/src/wndproc.c
+++ b/src/wndproc.c
@@ -701,16 +701,8 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
                 x = (DWORD)(roundf(GET_X_LPARAM(lParam) * g_ddraw->render.unscale_w));
                 y = (DWORD)(roundf(GET_Y_LPARAM(lParam) * g_ddraw->render.unscale_h));
 
-                InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
-                InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
-
                 lParam = MAKELPARAM(x, y);
             }
-            else
-            {
-                InterlockedExchange((LONG*)&g_ddraw->cursor.x, GET_X_LPARAM(lParam));
-                InterlockedExchange((LONG*)&g_ddraw->cursor.y, GET_Y_LPARAM(lParam));
-            }
         }
 
         if (GET_X_LPARAM(lParam) > g_ddraw->width || GET_Y_LPARAM(lParam) > g_ddraw->height)
@@ -718,15 +710,12 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             x = min(GET_X_LPARAM(lParam), g_ddraw->width);
             y = min(GET_Y_LPARAM(lParam), g_ddraw->height);
 
-            if (g_ddraw->devmode)
-            {
-                InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
-                InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
-            }
-
             lParam = MAKELPARAM(x, y);
         }
 
+        InterlockedExchange((LONG*)&g_ddraw->cursor.x, GET_X_LPARAM(lParam));
+        InterlockedExchange((LONG*)&g_ddraw->cursor.y, GET_Y_LPARAM(lParam));
+
         break;
     }
     case WM_PARENTNOTIFY: