diff --git a/rigpa-mode-mode.el b/rigpa-mode-mode.el
index fac6240..ae6cb01 100644
--- a/rigpa-mode-mode.el
+++ b/rigpa-mode-mode.el
@@ -89,9 +89,10 @@ MODE."
          (name (if current-lithium-mode
                    (rigpa-name-for-lithium-mode
                     current-lithium-mode)
-                 (rigpa--local-recall-mode)))
-         (evil-state-fn (rigpa-evil-state-by-name name)))
-    (funcall evil-state-fn)))
+                 (rigpa--local-recall-mode))))
+    (when name
+      (funcall
+       (rigpa-evil-state-by-name name)))))
 
 (defun rigpa-enter-mode (mode-name)
   "Enter mode MODE-NAME.