diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/HttpListenerService.java b/undertow/src/main/java/org/wildfly/extension/undertow/HttpListenerService.java
index 2a977622f66c..33315d436aa0 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/HttpListenerService.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/HttpListenerService.java
@@ -34,6 +34,7 @@
 import io.undertow.server.handlers.ProxyPeerAddressHandler;
 import io.undertow.server.handlers.SSLHeaderHandler;
 import io.undertow.server.protocol.http.HttpOpenListener;
+import io.undertow.server.protocol.http2.Http2UpgradeHandler;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.ValueService;
@@ -71,6 +72,14 @@ public HttpHandler wrap(final HttpHandler handler) {
                 return httpUpgradeHandler;
             }
         });
+        if(listenerOptions.get(UndertowOptions.ENABLE_HTTP2, false)) {
+            addWrapperHandler(new HandlerWrapper() {
+                @Override
+                public HttpHandler wrap(HttpHandler handler) {
+                    return new Http2UpgradeHandler(handler);
+                }
+            });
+        }
         if (certificateForwarding) {
             addWrapperHandler(new HandlerWrapper() {
                 @Override