diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el
index 7a6a1b73f..40e239ece 100644
--- a/modules/app/calendar/autoload.el
+++ b/modules/app/calendar/autoload.el
@@ -31,7 +31,8 @@
   (if (featurep! :ui workspaces)
       (+workspace/delete "Calendar")
     (doom-kill-matching-buffers "^\\*cfw:")
-    (set-window-configuration +calendar--wconf)
+    (when (window-configuration-p +calendar--wconf)
+      (set-window-configuration +calendar--wconf))
     (setq +calendar--wconf nil)))
 
 ;;;###autoload