diff --git a/src/node_file.cc b/src/node_file.cc
index 9de7fe0e378642..39cce2ea6bdd64 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -951,14 +951,20 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
       name_v[name_idx++] = filename.ToLocalChecked();
 
       if (name_idx >= arraysize(name_v)) {
-        fn->Call(env->context(), names, name_idx, name_v)
-            .ToLocalChecked();
+        MaybeLocal<Value> ret = fn->Call(env->context(), names, name_idx,
+                                         name_v);
+        if (ret.IsEmpty()) {
+          return;
+        }
         name_idx = 0;
       }
     }
 
     if (name_idx > 0) {
-      fn->Call(env->context(), names, name_idx, name_v).ToLocalChecked();
+      MaybeLocal<Value> ret = fn->Call(env->context(), names, name_idx, name_v);
+      if (ret.IsEmpty()) {
+        return;
+      }
     }
 
     args.GetReturnValue().Set(names);
diff --git a/test/parallel/test-fs-readdir-stack-overflow.js b/test/parallel/test-fs-readdir-stack-overflow.js
new file mode 100644
index 00000000000000..b7dea52cc37ec5
--- /dev/null
+++ b/test/parallel/test-fs-readdir-stack-overflow.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const common = require('../common');
+
+const fs = require('fs');
+
+function recurse() {
+  fs.readdirSync('.');
+  recurse();
+}
+
+common.expectsError(
+  () => recurse(),
+  {
+    type: RangeError,
+    message: 'Maximum call stack size exceeded'
+  }
+);