diff --git a/render.c b/render.c
index 5692ded8..942653b4 100644
--- a/render.c
+++ b/render.c
@@ -439,6 +439,9 @@ static const struct wl_callback_listener frame_listener = {
 void
 grid_render(struct terminal *term)
 {
+    if (term->is_shutting_down)
+        return;
+
 #define TIME_FRAME_RENDERING 0
 
 #if TIME_FRAME_RENDERING
diff --git a/terminal.c b/terminal.c
index 05aea862..c3f061f9 100644
--- a/terminal.c
+++ b/terminal.c
@@ -308,9 +308,6 @@ term_arm_blink_timer(struct terminal *term)
 static void
 cursor_refresh(struct terminal *term)
 {
-    if (term->is_shutting_down)
-        return;
-
     term->grid->cur_row->cells[term->cursor.point.col].attrs.clean = 0;
     term->grid->cur_row->dirty = true;
     render_refresh(term);