diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
index bc8a118ba1d64..0bd96725c66b4 100644
--- a/modules/lang-painless/build.gradle
+++ b/modules/lang-painless/build.gradle
@@ -29,7 +29,7 @@ integTestCluster {
 }
 
 dependencies {
-  compile 'org.antlr:antlr4-runtime:4.5.1-1'
+  compile 'org.antlr:antlr4-runtime:4.5.3'
   compile 'org.ow2.asm:asm-debug-all:5.1'
 }
 
@@ -71,7 +71,7 @@ configurations {
 }
 
 dependencies {
-  regenerate 'org.antlr:antlr4:4.5.1-1'
+  regenerate 'org.antlr:antlr4:4.5.3'
 }
 
 String grammarPath = 'src/main/antlr'
diff --git a/modules/lang-painless/licenses/antlr4-runtime-4.5.1-1.jar.sha1 b/modules/lang-painless/licenses/antlr4-runtime-4.5.1-1.jar.sha1
deleted file mode 100644
index 37f80b91724f6..0000000000000
--- a/modules/lang-painless/licenses/antlr4-runtime-4.5.1-1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-66144204f9d6d7d3f3f775622c2dd7e9bd511d97
\ No newline at end of file
diff --git a/modules/lang-painless/licenses/antlr4-runtime-4.5.3.jar.sha1 b/modules/lang-painless/licenses/antlr4-runtime-4.5.3.jar.sha1
new file mode 100644
index 0000000000000..535955b7d6826
--- /dev/null
+++ b/modules/lang-painless/licenses/antlr4-runtime-4.5.3.jar.sha1
@@ -0,0 +1 @@
+2609e36f18f7e8d593cc1cddfb2ac776dc96b8e0
\ No newline at end of file
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
index fd32c59b4ff03..734089c384a5f 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
@@ -11,7 +11,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 abstract class PainlessLexer extends Lexer {
-  static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
+  static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
 
   protected static final DFA[] _decisionToDFA;
   protected static final PredictionContextCache _sharedContextCache =
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
index 619c582d04a2f..528a8a3d851c6 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
@@ -11,7 +11,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 class PainlessParser extends Parser {
-  static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
+  static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
 
   protected static final DFA[] _decisionToDFA;
   protected static final PredictionContextCache _sharedContextCache =
@@ -579,6 +579,7 @@ public final StatementContext statement() throws RecognitionException {
     try {
       int _alt;
       setState(185);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
       case 1:
         _localctx = new IfContext(_localctx);
@@ -595,6 +596,7 @@ public final StatementContext statement() throws RecognitionException {
         setState(103);
         trailer();
         setState(107);
+        _errHandler.sync(this);
         switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
         case 1:
           {
@@ -1127,6 +1129,7 @@ public final InitializerContext initializer() throws RecognitionException {
     enterRule(_localctx, 14, RULE_initializer);
     try {
       setState(204);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -1653,6 +1656,7 @@ private ExpressionContext expression(int _p) throws RecognitionException {
           _prevctx = _localctx;
           {
           setState(290);
+          _errHandler.sync(this);
           switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
           case 1:
             {
@@ -1979,6 +1983,7 @@ public final UnaryContext unary() throws RecognitionException {
     int _la;
     try {
       setState(308);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) {
       case 1:
         _localctx = new PreContext(_localctx);
@@ -2126,6 +2131,7 @@ public final ChainContext chain() throws RecognitionException {
     try {
       int _alt;
       setState(326);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
       case 1:
         _localctx = new DynamicContext(_localctx);
@@ -2342,6 +2348,7 @@ public final PrimaryContext primary() throws RecognitionException {
     int _la;
     try {
       setState(346);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
       case 1:
         _localctx = new PrecedenceContext(_localctx);
@@ -2493,6 +2500,7 @@ public final PostfixContext postfix() throws RecognitionException {
     enterRule(_localctx, 36, RULE_postfix);
     try {
       setState(351);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -2551,6 +2559,7 @@ public final PostdotContext postdot() throws RecognitionException {
     enterRule(_localctx, 38, RULE_postdot);
     try {
       setState(355);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -2803,6 +2812,7 @@ public final ArrayinitializerContext arrayinitializer() throws RecognitionExcept
     try {
       int _alt;
       setState(412);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,34,_ctx) ) {
       case 1:
         _localctx = new NewstandardarrayContext(_localctx);
@@ -2837,6 +2847,7 @@ public final ArrayinitializerContext arrayinitializer() throws RecognitionExcept
           _alt = getInterpreter().adaptivePredict(_input,27,_ctx);
         } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
         setState(385);
+        _errHandler.sync(this);
         switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
         case 1:
           {
@@ -2974,6 +2985,7 @@ public final ListinitializerContext listinitializer() throws RecognitionExceptio
     int _la;
     try {
       setState(427);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -3055,6 +3067,7 @@ public final MapinitializerContext mapinitializer() throws RecognitionException
     int _la;
     try {
       setState(443);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -3252,6 +3265,7 @@ public final ArgumentContext argument() throws RecognitionException {
     enterRule(_localctx, 56, RULE_argument);
     try {
       setState(465);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,41,_ctx) ) {
       case 1:
         enterOuterAlt(_localctx, 1);
@@ -3533,6 +3547,7 @@ public final FuncrefContext funcref() throws RecognitionException {
     enterRule(_localctx, 62, RULE_funcref);
     try {
       setState(505);
+      _errHandler.sync(this);
       switch ( getInterpreter().adaptivePredict(_input,47,_ctx) ) {
       case 1:
         _localctx = new ClassfuncrefContext(_localctx);