diff --git a/exwm-layout.el b/exwm-layout.el
index 5adb54a..5a0b217 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -385,6 +385,7 @@ If FRAME is nil, refresh layout of selected frame."
                                     (car-safe (window-prev-buffers window)))))
                   (and
                    prev-buffer
+                   (buffer-live-p prev-buffer)
                    (with-current-buffer prev-buffer
                      (derived-mode-p 'exwm-mode))
                    (push prev-buffer covered-buffers)))))))))