diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c
index 9f12f858f..67fbee932 100644
--- a/jerry-core/parser/js/js-parser.c
+++ b/jerry-core/parser/js/js-parser.c
@@ -1809,7 +1809,8 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */
     if (JERRY_UNLIKELY (context_p->lit_object.literal_p->status_flags & LEXER_FLAG_FUNCTION_ARGUMENT))
     {
 #if ENABLED (JERRY_ES2015)
-      if (context_p->status_flags & PARSER_FUNCTION_HAS_NON_SIMPLE_PARAM)
+      if ((context_p->status_flags & PARSER_FUNCTION_HAS_NON_SIMPLE_PARAM)
+          || (context_p->status_flags & PARSER_IS_ARROW_FUNCTION))
       {
         parser_raise_error (context_p, PARSER_ERR_DUPLICATED_ARGUMENT_NAMES);
       }
diff --git a/tests/jerry/es2015/arrow-function.js b/tests/jerry/es2015/arrow-function.js
index e93a80531..0b9b8f683 100644
--- a/tests/jerry/es2015/arrow-function.js
+++ b/tests/jerry/es2015/arrow-function.js
@@ -154,6 +154,8 @@ must_throw ("!x => 4");
 must_throw ("x => {} = 1");
 must_throw ("x => {} a = 1");
 must_throw ("x => {} ? 1 : 0");
+must_throw ("(x,x,x) => 0");
+must_throw ("(x,x,x) => { }");
 must_throw_strict ("(package) => 0");
 must_throw_strict ("(package) => { return 5 }");
 must_throw_strict ("(x,x,x) => 0");