diff --git a/hbmqtt/adapters.py b/hbmqtt/adapters.py
index 9fb3257..c30bc53 100644
--- a/hbmqtt/adapters.py
+++ b/hbmqtt/adapters.py
@@ -165,6 +165,9 @@ class StreamWriterAdapter(WriterAdapter):
 
     @asyncio.coroutine
     def close(self):
+        yield from self._writer.drain()
+        if self._writer.can_write_eof():
+            self._writer.write_eof()
         self._writer.close()