diff --git a/src/encoder.hpp b/src/encoder.hpp
index b77adaf0..20eca8a4 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -124,11 +124,6 @@ namespace zmq
             *size_ = pos;
         }
 
-        inline bool has_data ()
-        {
-            return to_write > 0;
-        }
-
     protected:
 
         //  Prototype of state machine action.
diff --git a/src/i_encoder.hpp b/src/i_encoder.hpp
index 9a0812fb..8cc491c6 100644
--- a/src/i_encoder.hpp
+++ b/src/i_encoder.hpp
@@ -47,7 +47,6 @@ namespace zmq
         virtual void get_data (unsigned char **data_, size_t *size_,
             int *offset_ = NULL) = 0;
 
-        virtual bool has_data () = 0;
     };
 
 }
diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
index 8121469b..a160ced0 100644
--- a/src/stream_engine.cpp
+++ b/src/stream_engine.cpp
@@ -63,7 +63,6 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_, cons
     options (options_),
     endpoint (endpoint_),
     plugged (false),
-    terminating (false),
     socket (NULL)
 {
     //  Put the socket into non-blocking mode.
@@ -173,11 +172,6 @@ void zmq::stream_engine_t::unplug ()
 
 void zmq::stream_engine_t::terminate ()
 {
-    if (!terminating && encoder && encoder->has_data ()) {
-        //  Give io_thread a chance to send in the buffer
-        terminating = true;
-        return;
-    }
     unplug ();
     delete this;
 }
@@ -279,8 +273,6 @@ void zmq::stream_engine_t::out_event ()
     //  this is necessary to prevent losing incomming messages.
     if (nbytes == -1) {
         reset_pollout (handle);
-        if (unlikely (terminating))
-            terminate ();
         return;
     }
 
@@ -292,10 +284,6 @@ void zmq::stream_engine_t::out_event ()
     if (unlikely (handshaking))
         if (outsize == 0)
             reset_pollout (handle);
-
-    if (unlikely (terminating))
-        if (outsize == 0)
-            terminate ();
 }
 
 void zmq::stream_engine_t::activate_out ()
diff --git a/src/stream_engine.hpp b/src/stream_engine.hpp
index e74dc2b9..2d83995c 100644
--- a/src/stream_engine.hpp
+++ b/src/stream_engine.hpp
@@ -135,7 +135,6 @@ namespace zmq
         std::string endpoint;
 
         bool plugged;
-        bool terminating;
 
         // Socket
         zmq::socket_base_t *socket;