diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c
index be27b8e2c..15697582e 100644
--- a/polyp/module-protocol-stub.c
+++ b/polyp/module-protocol-stub.c
@@ -240,5 +240,12 @@ finish:
 void pa__done(struct pa_core *c, struct pa_module*m) {
     assert(c && m);
 
+#if defined(USE_PROTOCOL_ESOUND)
+	if (remove (ESD_UNIX_SOCKET_NAME) != 0)
+		pa_log("%s: Failed to remove %s : %s.\n", __FILE__, ESD_UNIX_SOCKET_NAME, strerror (errno));
+	if (remove (ESD_UNIX_SOCKET_DIR) != 0)
+		pa_log("%s: Failed to remove %s : %s.\n", __FILE__, ESD_UNIX_SOCKET_DIR, strerror (errno));
+#endif
+
     protocol_free(m->userdata);
 }