diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 80dea16106b..a8662c4a2b7 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -24,6 +24,7 @@
 ;;; Code:
 
 (require 'esh-mode)
+(require 'esh-cmd)
 (require 'esh-io)
 
 ;;;###esh-module-autoload
@@ -127,10 +128,9 @@ Comments begin with `#'."
     (with-temp-buffer
       (eshell-mode)
       (eshell-do-eval
-       `(let ((eshell-current-handles
-               (eshell-create-handles ,stdout 'insert ,stderr 'insert))
-              (eshell-current-subjob-p))
-          ,(eshell--source-file file args))
+       `(eshell-with-handles (,stdout 'insert ,stderr 'insert)
+          (let ((eshell-current-subjob-p))
+            ,(eshell--source-file file args)))
        t))))
 
 (cl-defstruct (eshell-princ-target