diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index f16094d45..86e811ea1 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -534,6 +534,9 @@ XIDestroyPointerBarrier(ClientPtr client,
         return err;
     }
 
+    if (CLIENT_ID(stuff->barrier) != client->index)
+        return BadAccess;
+
     FreeResource(stuff->barrier, RT_NONE);
     return Success;
 }