diff --git a/core/core-editor.el b/core/core-editor.el
index 88ae20724..0962c5a7b 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -102,7 +102,10 @@ fundamental-mode) for performance sake."
   (defun doom|unpropertize-kill-ring ()
     "Remove text properties from `kill-ring' in the interest of shrinking the
 savehist file."
-    (setq kill-ring (mapcar #'substring-no-properties kill-ring)))
+    (setq kill-ring (cl-loop for item in kill-ring
+                             if (stringp item)
+                             collect (substring-no-properties item)
+                             else if item collect it)))
   (add-hook 'kill-emacs-hook #'doom|unpropertize-kill-ring))
 
 ;; persistent point location in buffers