diff --git a/CHANGELOG.md b/CHANGELOG.md
index f46d88c2..8b6560dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 253:
 
 * Fix async_detect_ssl handler type
+* member get_executor const-correctness
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/core/basic_stream.hpp b/include/boost/beast/core/basic_stream.hpp
index 057ab07f..52861f03 100644
--- a/include/boost/beast/core/basic_stream.hpp
+++ b/include/boost/beast/core/basic_stream.hpp
@@ -498,7 +498,7 @@ public:
         @return A copy of the executor that stream will use to dispatch handlers.
     */
     executor_type
-    get_executor() const noexcept
+    get_executor() noexcept
     {
         return impl_->ex();
     }
diff --git a/include/boost/beast/websocket/impl/stream.hpp b/include/boost/beast/websocket/impl/stream.hpp
index 870ea4e8..12fbf465 100644
--- a/include/boost/beast/websocket/impl/stream.hpp
+++ b/include/boost/beast/websocket/impl/stream.hpp
@@ -63,7 +63,7 @@ stream(Args&&... args)
 template<class NextLayer, bool deflateSupported>
 auto
 stream<NextLayer, deflateSupported>::
-get_executor() const noexcept ->
+get_executor() noexcept ->
     executor_type
 {
     return impl_->stream().get_executor();
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index a9d79d2d..e6f12a38 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -220,7 +220,7 @@ public:
         @return A copy of the executor that stream will use to dispatch handlers.
     */
     executor_type
-    get_executor() const noexcept;
+    get_executor() noexcept;
 
     /** Get a reference to the next layer
 
diff --git a/test/beast/core/stream_traits.cpp b/test/beast/core/stream_traits.cpp
index 4e6e2d09..4498837a 100644
--- a/test/beast/core/stream_traits.cpp
+++ b/test/beast/core/stream_traits.cpp
@@ -213,14 +213,14 @@ public:
 
     struct async_read_stream
     {
-        net::io_context::executor_type get_executor();
+        net::io_context::executor_type get_executor() noexcept;
         template<class MutableBufferSequence, class ReadHandler>
         void async_read_some(MutableBufferSequence const&, ReadHandler&&);
     };
 
     struct async_write_stream
     {
-        net::io_context::executor_type get_executor();
+        net::io_context::executor_type get_executor() noexcept;
         template<class ConstBufferSequence, class WriteHandler>
         void async_write_some(ConstBufferSequence const&, WriteHandler&&);
     };
@@ -231,7 +231,7 @@ public:
 
     struct async_stream : async_read_stream, async_write_stream
     {
-        net::io_context::executor_type get_executor();
+        net::io_context::executor_type get_executor() noexcept;
         template<class MutableBufferSequence, class ReadHandler>
         void async_read_some(MutableBufferSequence const&, ReadHandler&&);
         template<class ConstBufferSequence, class WriteHandler>