diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/CorsEnablingHandler.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/CorsEnablingHandler.java
index 9fe21bf9c9..e898aab276 100644
--- a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/CorsEnablingHandler.java
+++ b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/CorsEnablingHandler.java
@@ -84,7 +84,7 @@ public ApiVersion apiVersion() {
 
     @Override
     public int getPriority() {
-        return 0;
+        return 1;
     }
 
     @Override
diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/HttpGenericModule.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/HttpGenericModule.java
index 815ed54654..6ba2698a92 100644
--- a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/HttpGenericModule.java
+++ b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/HttpGenericModule.java
@@ -50,6 +50,10 @@
 @Module
 public abstract class HttpGenericModule {
 
+    @Binds
+    @IntoSet
+    abstract RequestHandler bindTimeoutHandler(TimeoutHandler handler);
+
     @Binds
     @IntoSet
     abstract RequestHandler bindCorsEnablingHandler(CorsEnablingHandler handler);
diff --git a/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/TimeoutHandler.java b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/TimeoutHandler.java
new file mode 100644
index 0000000000..3ce9d86278
--- /dev/null
+++ b/src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/generic/TimeoutHandler.java
@@ -0,0 +1,86 @@
+/*-
+ * #%L
+ * Container JFR
+ * %%
+ * Copyright (C) 2020 Red Hat, Inc.
+ * %%
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software (each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ * The above copyright notice and either this complete permission notice or at
+ * a minimum a reference to the UPL must be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * #L%
+ */
+package com.redhat.rhjmc.containerjfr.net.web.http.generic;
+
+import javax.inject.Inject;
+
+import com.redhat.rhjmc.containerjfr.net.web.http.RequestHandler;
+import com.redhat.rhjmc.containerjfr.net.web.http.api.ApiVersion;
+
+import io.vertx.core.http.HttpMethod;
+import io.vertx.ext.web.RoutingContext;
+
+class TimeoutHandler implements RequestHandler {
+
+    static final long TIMEOUT_MS = 15_000L;
+    final io.vertx.ext.web.handler.TimeoutHandler handler;
+
+    @Inject
+    TimeoutHandler() {
+        this.handler = io.vertx.ext.web.handler.TimeoutHandler.create(TIMEOUT_MS);
+    }
+
+    @Override
+    public int getPriority() {
+        return 0;
+    }
+
+    @Override
+    public ApiVersion apiVersion() {
+        return ApiVersion.GENERIC;
+    }
+
+    @Override
+    public HttpMethod httpMethod() {
+        return HttpMethod.OTHER;
+    }
+
+    @Override
+    public String path() {
+        return ALL_PATHS;
+    }
+
+    @Override
+    public void handle(RoutingContext ctx) {
+        handler.handle(ctx);
+    }
+}