diff --git a/dix/devices.c b/dix/devices.c
index 05a6b51af..4dd1dc5f1 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -885,7 +885,8 @@ RemoveDevice(DeviceIntPtr dev)
         return BadImplementation;
 
     initialized = dev->inited;
-    screen->DisplayCursor(dev, screen, NullCursor);
+    if (DevHasCursor(dev))
+        screen->DisplayCursor(dev, screen, NullCursor);
 
     deviceid = dev->id;
     DisableDevice(dev);