diff --git a/gsk/gl/gskglglyphcache.c b/gsk/gl/gskglglyphcache.c
index 0357f9910d..66b84a02be 100644
--- a/gsk/gl/gskglglyphcache.c
+++ b/gsk/gl/gskglglyphcache.c
@@ -189,11 +189,13 @@ upload_glyph (GlyphCacheKey    *key,
 
   if (render_glyph (key, value, &r))
     {
+      glPixelStorei (GL_UNPACK_ROW_LENGTH, r.stride / 4);
       glBindTexture (GL_TEXTURE_2D, value->texture_id);
       glTexSubImage2D (GL_TEXTURE_2D, 0,
                        r.x, r.y, r.width, r.height,
                        GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
                        r.data);
+      glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
       g_free (r.data);
     }