diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c
index 68772ee0f..5932eaa23 100644
--- a/sway/desktop/surface.c
+++ b/sway/desktop/surface.c
@@ -56,6 +56,7 @@ void surface_update_outputs(struct wlr_surface *surface) {
 		}
 	}
 	wlr_fractional_scale_v1_notify_scale(surface, scale);
+	wlr_surface_set_preferred_buffer_scale(surface, ceil(scale));
 }
 
 void surface_enter_output(struct wlr_surface *surface,
diff --git a/sway/server.c b/sway/server.c
index cc4719d72..3a11088a7 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -103,7 +103,7 @@ bool server_init(struct sway_server *server) {
 		return false;
 	}
 
-	server->compositor = wlr_compositor_create(server->wl_display, 5,
+	server->compositor = wlr_compositor_create(server->wl_display, 6,
 		server->renderer);
 	server->compositor_new_surface.notify = handle_compositor_new_surface;
 	wl_signal_add(&server->compositor->events.new_surface,