diff --git a/src/ctx.cpp b/src/ctx.cpp
index 972dd53c..96d0b301 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -303,6 +303,26 @@ int zmq::ctx_t::register_endpoint (const char *addr_, endpoint_t &endpoint_)
     return 0;
 }
 
+int zmq::ctx_t::unregister_endpoint (
+        const std::string &addr_, socket_base_t *socket_)
+{
+    endpoints_sync.lock ();
+
+    const endpoints_t::iterator it = endpoints.find (addr_);
+    if (it == endpoints.end () || it->second.socket != socket_) {
+        endpoints_sync.unlock ();
+        errno = ENOENT;
+        return -1;
+    }
+
+    //  Remove endpoint.
+    endpoints.erase (it);
+
+    endpoints_sync.unlock ();
+
+    return 0;
+}
+
 void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_)
 {
     endpoints_sync.lock ();
diff --git a/src/ctx.hpp b/src/ctx.hpp
index 43e3237e..dad83860 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -92,6 +92,7 @@ namespace zmq
 
         //  Management of inproc endpoints.
         int register_endpoint (const char *addr_, endpoint_t &endpoint_);
+        int unregister_endpoint (const std::string &addr_, socket_base_t *socket_);
         void unregister_endpoints (zmq::socket_base_t *socket_);
         endpoint_t find_endpoint (const char *addr_);
 
diff --git a/src/object.cpp b/src/object.cpp
index 57e6ea81..eb9735e4 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -134,6 +134,12 @@ int zmq::object_t::register_endpoint (const char *addr_, endpoint_t &endpoint_)
     return ctx->register_endpoint (addr_, endpoint_);
 }
 
+int zmq::object_t::unregister_endpoint (
+        const std::string &addr_, socket_base_t *socket_)
+{
+    return ctx->unregister_endpoint (addr_, socket_);
+}
+
 void zmq::object_t::unregister_endpoints (socket_base_t *socket_)
 {
     return ctx->unregister_endpoints (socket_);
diff --git a/src/object.hpp b/src/object.hpp
index 932cea7d..4bb34a38 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -22,6 +22,7 @@
 #ifndef __ZMQ_OBJECT_HPP_INCLUDED__
 #define __ZMQ_OBJECT_HPP_INCLUDED__
 
+#include <string>
 #include "stdint.hpp"
 
 namespace zmq
@@ -57,6 +58,8 @@ namespace zmq
         //  Using following function, socket is able to access global
         //  repository of inproc endpoints.
         int register_endpoint (const char *addr_, zmq::endpoint_t &endpoint_);
+        int unregister_endpoint (
+                const std::string &addr_, socket_base_t *socket_);
         void unregister_endpoints (zmq::socket_base_t *socket_);
         zmq::endpoint_t find_endpoint (const char *addr_);
         void destroy_socket (zmq::socket_base_t *socket_);
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 7fe40089..c425e93f 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -600,6 +600,8 @@ int zmq::socket_base_t::term_endpoint (const char *addr_)
 
     // Disconnect an inproc socket
     if (protocol == "inproc") {
+        if (unregister_endpoint (std::string (addr_), this) == 0)
+            return 0;
         std::pair <inprocs_t::iterator, inprocs_t::iterator> range = inprocs.equal_range (std::string (addr_));
         if (range.first == range.second) {
             errno = ENOENT;