diff --git a/terminal.c b/terminal.c
index e4396585..6144bacb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2125,7 +2125,7 @@ term_fractional_scaling(const struct terminal *term)
 bool
 term_preferred_buffer_scale(const struct terminal *term)
 {
-    return term->wl->has_wl_compositor_v6;
+    return term->wl->has_wl_compositor_v6 && term->window->preferred_buffer_scale > 0;
 }
 
 bool
diff --git a/wayland.c b/wayland.c
index 2645c4ab..1d9d3cdf 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1738,10 +1738,6 @@ wayl_win_init(struct terminal *term, const char *token)
             win->fractional_scale, &fractional_scale_listener, win);
     }
 
-    if (wayl->has_wl_compositor_v6) {
-        win->preferred_buffer_scale = 1;
-    }
-
     win->xdg_surface = xdg_wm_base_get_xdg_surface(wayl->shell, win->surface.surf);
     xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, win);