diff --git a/jerry-core/ecma/operations/ecma-jobqueue.c b/jerry-core/ecma/operations/ecma-jobqueue.c
index 6dd2bdc62..e7ff08ef6 100644
--- a/jerry-core/ecma/operations/ecma-jobqueue.c
+++ b/jerry-core/ecma/operations/ecma-jobqueue.c
@@ -256,6 +256,8 @@ ecma_process_promise_resolve_thenable_job (void *obj_p) /**< the job to be opera
 
   if (ECMA_IS_VALUE_ERROR (then_call_result))
   {
+    then_call_result = JERRY_CONTEXT (error_value);
+
     ret = ecma_op_function_call (ecma_get_object_from_value (funcs->reject),
                                  ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
                                  &then_call_result,
diff --git a/tests/jerry/es2015/regression-test-issue-2107.js b/tests/jerry/es2015/regression-test-issue-2107.js
new file mode 100644
index 000000000..e92af8fdd
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-2107.js
@@ -0,0 +1,23 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var thenableWithError = {
+  then: function() { throw new Error("") }
+};
+
+function executor(resolve) {
+  resolve(thenableWithError)
+}
+
+new Promise(executor);