nodejs
diff --git a/‎src/api/environment.cc‎
Lines changed: 1 addition & 3 deletions b/‎src/api/environment.cc‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/env.cc‎
Lines changed: 4 additions & 0 deletions b/‎src/env.cc‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎test/parallel/test-worker-abort-on-uncaught-exception.js‎
Lines changed: 12 additions & 0 deletions b/‎test/parallel/test-worker-abort-on-uncaught-exception.js‎
Lines changed: 12 additions & 0 deletions
@@ -42,6 +42,7 @@ static bool ShouldAbortOnUncaughtException(Isolate* isolate) {
   Environment* env = Environment::GetCurrent(isolate);
   return env != nullptr &&
          (env->is_main_thread() || !env->is_stopping()) &&
+         env->abort_on_uncaught_exception() &&
          env->should_abort_on_uncaught_toggle()[0] &&
          !env->inside_should_not_abort_on_uncaught_scope();
 }
@@ -355,9 +356,6 @@ Environment* CreateEnvironment(
       exec_args,
       flags,
       thread_id);
-  if (flags & EnvironmentFlags::kOwnsProcessState) {
-    env->set_abort_on_uncaught_exception(false);
-  }
 
 #if HAVE_INSPECTOR
   if (inspector_parent_handle) {
 
@@ -348,6 +348,10 @@ Environment::Environment(IsolateData* isolate_data,
   inspector_host_port_.reset(
       new ExclusiveAccess<HostPort>(options_->debug_options().host_port));
 
+  if (!(flags_ & EnvironmentFlags::kOwnsProcessState)) {
+    set_abort_on_uncaught_exception(false);
+  }
+
 #if HAVE_INSPECTOR
   // We can only create the inspector agent after having cloned the options.
   inspector_agent_ = std::make_unique<inspector::Agent>(this);
 
@@ -0,0 +1,12 @@
+// Flags: --abort-on-uncaught-exception
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { Worker } = require('worker_threads');
+
+// Tests that --abort-on-uncaught-exception does not apply to
+// Workers.
+
+const w = new Worker('throw new Error()', { eval: true });
+w.on('error', common.mustCall());
+w.on('exit', common.mustCall((code) => assert.strictEqual(code, 1)));