diff --git a/device/device.go b/device/device.go
index 9a9b1b3..d18192e 100644
--- a/device/device.go
+++ b/device/device.go
@@ -387,7 +387,8 @@ func (device *Device) RemoveAllPeers() {
 func (device *Device) FlushPacketQueues() {
 	for {
 		select {
-		case <-device.queue.handshake:
+		case elem := <-device.queue.handshake:
+			device.PutMessageBuffer(elem.buffer)
 		default:
 			return
 		}