diff --git a/src/output/render-manager.cpp b/src/output/render-manager.cpp
index 6a8288c8c..16ec2b877 100644
--- a/src/output/render-manager.cpp
+++ b/src/output/render-manager.cpp
@@ -957,6 +957,13 @@ class wf::render_manager::impl
 
         on_frame.set_callback([&] (void*)
         {
+            /* If the session is not active, don't paint.
+             * This is the case when e.g. switching to another tty */
+            if (!wf::get_core().session->active)
+            {
+                return;
+            }
+
             delay_manager->start_frame();
 
             auto repaint_delay = delay_manager->get_delay();