diff --git a/src/rpc/rpc.cc b/src/rpc/rpc.cc
index a360535812..88d2660c52 100644
--- a/src/rpc/rpc.cc
+++ b/src/rpc/rpc.cc
@@ -1021,9 +1021,9 @@ namespace rpc {
                       log_exception(*this, log_level::debug, "fail to connect", ep);
                   }
               }
-            _stream_queue.abort(ep);
           }
           _error = true;
+          _stream_queue.abort(std::make_exception_ptr(stream_closed()));
           return stop_send_loop(ep).then_wrapped([this] (future<> f) {
               f.ignore_ready_future();
               _outstanding.clear();
@@ -1242,10 +1242,10 @@ future<> server::connection::send_unknown_verb_reply(std::optional<rpc_clock_typ
               ep = f.get_exception();
               log_exception(*this, log_level::error,
                       format("server{} connection dropped", is_stream() ? " stream" : "").c_str(), ep);
-            _stream_queue.abort(ep);
           }
           _fd.shutdown_input();
           _error = true;
+          _stream_queue.abort(std::make_exception_ptr(stream_closed()));
           return stop_send_loop(ep).then_wrapped([this] (future<> f) {
               f.ignore_ready_future();
               get_server()._conns.erase(get_connection_id());