diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index ecb326e..7863972 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -621,6 +621,7 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
         send_property_event(device, prop->propertyName, XIPropertyDeleted);
         XIDestroyDeviceProperty(prop);
     }
+    device->properties.properties = NULL;
 
     /* Now free all handlers */
     curr_handler = device->properties.handlers;
@@ -630,7 +631,6 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
         xfree(curr_handler);
         curr_handler = next_handler;
     }
-
     device->properties.handlers = NULL;
 }