diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c
index b955977bd..a8a296e94 100644
--- a/jerry-core/vm/vm.c
+++ b/jerry-core/vm/vm.c
@@ -1494,6 +1494,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
         }
         case VM_OC_CLASS_EVAL:
         {
+          ECMA_CLEAR_SUPER_EVAL_PARSER_OPTS ();
           ECMA_SET_SUPER_EVAL_PARSER_OPTS (*byte_code_p++);
           continue;
         }
diff --git a/tests/jerry/es2015/regression-test-issue-2825.js b/tests/jerry/es2015/regression-test-issue-2825.js
new file mode 100644
index 000000000..9b9ff6df2
--- /dev/null
+++ b/tests/jerry/es2015/regression-test-issue-2825.js
@@ -0,0 +1,42 @@
+// 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 $;
+var called = false;
+
+function f() {}
+var B = class extends f {
+    constructor() {
+        eval();
+        super($)
+        this.g()
+    }
+}
+C = class extends B {
+    g() {
+        () => {
+          called = true;
+        }()
+    }
+}
+D = class extends C {
+    constructor() {
+        super()
+    }
+    g() {
+        eval('super["g"]')()
+    }
+}
+new D
+assert (called);