diff --git a/VERSION b/VERSION
index cc6c9a49..e75da3e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5
+2.3.6
diff --git a/lib/supavisor/client_handler.ex b/lib/supavisor/client_handler.ex
index 35e22ace..42fada58 100644
--- a/lib/supavisor/client_handler.ex
+++ b/lib/supavisor/client_handler.ex
@@ -605,6 +605,13 @@ defmodule Supavisor.ClientHandler do
     end
   end
 
+  def handle_event(:info, {sock_error, _sock, msg}, _state, _data)
+      when sock_error in [:tcp_error, :ssl_error] do
+    Logger.error("ClientHandler: Socket error: #{inspect(msg)}")
+
+    {:stop, {:shutdown, {:socket_error, msg}}}
+  end
+
   def handle_event(type, content, _state, _data) do
     msg = [
       {"type", type},