diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
@@ -899,7 +899,7 @@ def _write_ready(self):
                    self._sock.shutdown(socket.SHUT_WR)

    def write_eof(self):
-        if self._eof:
            return
        self._eof = True
        if not self._buffer:

diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
@@ -1263,6 +1263,12 @@ def test_write_eof_buffer(self):
        self.sock.shutdown.assert_called_with(socket.SHUT_WR)
        tr.close()

    @mock.patch('asyncio.base_events.logger')
    def test_transport_close_remove_writer(self, m_log):
        remove_writer = self.loop._remove_writer = mock.Mock()

diff --git a/Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst b/Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst
@@ -0,0 +1,2 @@