diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c99174..f3d08a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@
 - Add `ip-allowlist`/`ip-blocklist` options for remote forwarding connections.
 - Add telemetry for SSH/TCP/alias connections.
 
+### Fixed
+
+- Fix HTTP aliasing not working.
+
 ### Changed
 
 - Error early on missing/blocked HTTP alias for `channel_open_direct_tcpip`.
diff --git a/src/config.rs b/src/config.rs
index 7fc1aa4..04666d5 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -372,7 +372,7 @@ mod application_config_tests {
                 idle_connection_timeout: Duration::from_str("2s").unwrap(),
                 unproxied_connection_timeout: None,
                 authentication_request_timeout: Duration::from_str("5s").unwrap(),
-                http_request_timeout: Duration::from_str("10s").unwrap(),
+                http_request_timeout: Duration::from_str("30s").unwrap(),
                 tcp_connection_timeout: None
             }
         )
diff --git a/src/ssh.rs b/src/ssh.rs
index ea29a14..73a6fc3 100644
--- a/src/ssh.rs
+++ b/src/ssh.rs
@@ -12,6 +12,7 @@ use std::{
 use crate::{
     admin::AdminInterface,
     connection_handler::{ConnectionHandler, ConnectionHttpData},
+    connections::ConnectionGetByHttpHost,
     droppable_handle::DroppableHandle,
     error::ServerError,
     fingerprints::AuthenticationType,
@@ -1629,7 +1630,12 @@ impl Handler for ServerHandler {
         } else if port_to_connect == self.server.http_port
             || port_to_connect == self.server.https_port
         {
-            if let Some(handler) = self.server.http.get(host_to_connect) {
+            if let Some(handler) = self
+                .server
+                .aliasing_proxy_data
+                .conn_manager
+                .get_by_http_host(host_to_connect)
+            {
                 if handler
                     .can_alias(
                         self.peer.ip(),