diff --git a/eshell-atuin.el b/eshell-atuin.el
index ddeeb43..9d63e35 100644
--- a/eshell-atuin.el
+++ b/eshell-atuin.el
@@ -293,13 +293,13 @@ This only works for lines created with the value of the -f flag from
     (when (alist-get 'command e)
       (setf (alist-get 'formatted-value e)
             (format-spec eshell-atuin-history-format
-                         `((?t . ,(alist-get 'time e))
-                           (?e . ,(alist-get 'exit e))
-                           (?d . ,(alist-get 'duration e))
-                           (?c . ,(alist-get 'command e))
-                           (?i . ,(alist-get 'directory e))
-                           (?h . ,(alist-get 'host e))
-                           (?r . ,(alist-get 'relativetime e))))))
+                         `((?t . ,(alist-get 'time e ""))
+                           (?e . ,(alist-get 'exit e ""))
+                           (?d . ,(alist-get 'duration e ""))
+                           (?c . ,(alist-get 'command e ""))
+                           (?i . ,(alist-get 'directory e ""))
+                           (?h . ,(alist-get 'host e ""))
+                           (?r . ,(alist-get 'relativetime e ""))))))
     e))
 
 (defun eshell-atuin--add-datum-to-cache (datum)