diff --git a/transport/server.cc b/transport/server.cc
index fe120e365f..b7c3f9e491 100644
--- a/transport/server.cc
+++ b/transport/server.cc
@@ -544,9 +544,12 @@ future<> cql_server::connection::process()
 
 future<> cql_server::connection::shutdown()
 {
-    return _fd.shutdown_input().then([this] {
+    return make_ready_future<>().then([this] {
+        return _fd.shutdown_input();
+    }).then_wrapped([this] (auto&& f) {
+        f.ignore_ready_future();
         return _fd.shutdown_output();
-    });
+    }).handle_exception([] (auto) {});
 }
 
 future<> cql_server::connection::process_request() {