diff --git a/x.c b/x.c
index 798d006..3dcd130 100644
--- a/x.c
+++ b/x.c
@@ -583,6 +583,10 @@ void WiggleMouse(void)
 
 void doWarp(void)
 {
+#ifdef HAVE_XF86DGA
+  if (server_has_xf86dga)
+    return;
+#endif
   if(grabbed)
   {
     if(next_origo) return;
@@ -752,6 +756,7 @@ static void grabit(int x, int y, int state)
     remote_ypos=SCALEY(y);
     sendpointerevent(remote_xpos, remote_ypos, (state & 0x1f00) >> 8);
   }
+#endif
 
 
   mouseOnScreen = 1;