diff --git a/router/xgress/xgress.go b/router/xgress/xgress.go
index aa3de332f..49f1bcd54 100644
--- a/router/xgress/xgress.go
+++ b/router/xgress/xgress.go
@@ -261,6 +261,7 @@ func (self *Xgress) Unrouted() {
 	// When we're unrouted, if end of circuit hasn't already arrived, give incoming/queued data
 	// a chance to outflow before closing
 	if !self.flags.IsSet(closedFlag) {
+		self.payloadBuffer.Close()
 		time.AfterFunc(self.Options.MaxCloseWait, self.Close)
 	}
 }