diff --git a/glamor/glamor_copyarea.c b/glamor/glamor_copyarea.c
index de02224a3..87b53a983 100644
--- a/glamor/glamor_copyarea.c
+++ b/glamor/glamor_copyarea.c
@@ -219,6 +219,12 @@ glamor_copy_n_to_n_textured(DrawablePtr src,
 					src_pixmap_priv->fbo->tex);
 #ifndef GLAMOR_GLES2
 		dispatch->glEnable(GL_TEXTURE_2D);
+		dispatch->glTexParameteri(GL_TEXTURE_2D,
+					  GL_TEXTURE_WRAP_S,
+					  GL_CLAMP_TO_BORDER);
+		dispatch->glTexParameteri(GL_TEXTURE_2D,
+					  GL_TEXTURE_WRAP_T,
+					  GL_CLAMP_TO_BORDER);
 #endif
 		dispatch->glTexParameteri(GL_TEXTURE_2D,
 					  GL_TEXTURE_MIN_FILTER,
@@ -226,12 +232,6 @@ glamor_copy_n_to_n_textured(DrawablePtr src,
 		dispatch->glTexParameteri(GL_TEXTURE_2D,
 					  GL_TEXTURE_MAG_FILTER,
 					  GL_NEAREST);
-		dispatch->glTexParameteri(GL_TEXTURE_2D,
-					  GL_TEXTURE_WRAP_S,
-					  GL_CLAMP_TO_BORDER);
-		dispatch->glTexParameteri(GL_TEXTURE_2D,
-					  GL_TEXTURE_WRAP_T,
-					  GL_CLAMP_TO_BORDER);
 
 		dispatch->glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2,
 						GL_FLOAT, GL_FALSE,