diff --git a/modules/email/mu4e/autoload/email.el b/modules/email/mu4e/autoload/email.el
index 1fb11cf76..d8ed1d87d 100644
--- a/modules/email/mu4e/autoload/email.el
+++ b/modules/email/mu4e/autoload/email.el
@@ -52,7 +52,8 @@ default/fallback account."
   "Start email client."
   (interactive)
   (require 'mu4e)
-  (+workspace-switch +mu4e-workspace-name t)
+  (if (featurep :ui 'workspaces)
+      (+workspace-switch +mu4e-workspace-name t))
   (mu4e~start 'mu4e~main-view)
   ;; (save-selected-window
   ;;   (prolusion-mail-show))
@@ -74,5 +75,6 @@ default/fallback account."
 
 (defun +mu4e-kill-mu4e-h ()
   ;; (prolusion-mail-hide)
-  (when (+workspace-exists-p +mu4e-workspace-name)
+  (when (and (featurep :ui 'workspaces)
+             (+workspace-exists-p +mu4e-workspace-name))
     (+workspace/delete +mu4e-workspace-name)))