diff --git a/dix/colormap.c b/dix/colormap.c
index d702b0204..bf9794125 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -2705,6 +2705,9 @@ static void _colormap_find_resource(pointer value, XID id,
     ColormapPtr cmap = value;
     int j;
 
+    if (pScreen != cmap->pScreen)
+	return;
+
     j = cmap->pVisual - pScreen->visuals;
     cmap->pVisual = &visuals[j];
 }