diff --git a/http/websocket.hpp b/http/websocket.hpp
index 40fbcc0..30a9b9f 100644
--- a/http/websocket.hpp
+++ b/http/websocket.hpp
@@ -78,6 +78,9 @@
         closeHandler(std::move(closeHandler)),
         errorHandler(std::move(errorHandler)), session(reqIn.session)
     {
+        /* Turn on the timeouts on websocket stream to server role */
+        ws.set_option(boost::beast::websocket::stream_base::timeout::suggested(
+            boost::beast::role_type::server));
         BMCWEB_LOG_DEBUG << "Creating new connection " << this;
     }