diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index b2addf0c8..5a689599b 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -785,9 +785,13 @@ _cairo_surface_set_device_scale (cairo_surface_t *surface,
 
     surface->device_transform.xx = sx;
     surface->device_transform.yy = sy;
+    surface->device_transform.xy = 0.0;
+    surface->device_transform.yx = 0.0;
 
     surface->device_transform_inverse.xx = 1.0 / sx;
     surface->device_transform_inverse.yy = 1.0 / sy;
+    surface->device_transform_inverse.xy = 0.0;
+    surface->device_transform_inverse.yx = 0.0;
 }
 
 /**