1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 975f1b17143..5ae419f7ba9 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -263,8 +263,9 @@ element, regardless of any text on the command line.  In that case,
   (or eshell-history-size
       (let ((hsize (getenv "HISTSIZE")))
         (setq eshell-history-size
-              (if (and (> (length hsize) 0)
-                       (integerp (setq hsize (string-to-number hsize))))
+              (if (and (stringp hsize)
+                       (integerp (setq hsize (string-to-number hsize)))
+                       (> hsize 0))
                   hsize
                 128))))