diff --git a/src/wayland-client.c b/src/wayland-client.c
index 21d4606..58531eb 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -2177,10 +2177,12 @@ wl_proxy_get_class(struct wl_proxy *proxy)
 WL_EXPORT void
 wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue)
 {
-	if (queue)
+	if (queue) {
+		assert(proxy->display == queue->display);
 		proxy->queue = queue;
-	else
+	} else {
 		proxy->queue = &proxy->display->default_queue;
+	}
 }
 
 /** Create a proxy wrapper for making queue assignments thread-safe