diff --git a/drivers/block-nbd.c b/drivers/block-nbd.c
index cb912b59..82d76bce 100644
--- a/drivers/block-nbd.c
+++ b/drivers/block-nbd.c
@@ -185,6 +185,13 @@ tdnbd_fdreceiver_start()
 
 }
 
+void
+tdnbd_fdreceiver_stop()
+{
+	if (fdreceiver)
+		td_fdreceiver_stop(fdreceiver);
+}
+
 static void
 __cancel_req(int i, struct td_nbd_request *pos, int e)
 {
diff --git a/drivers/tapdisk2.c b/drivers/tapdisk2.c
index 2fb73872..d7f8401c 100644
--- a/drivers/tapdisk2.c
+++ b/drivers/tapdisk2.c
@@ -42,6 +42,7 @@
 #include "tapdisk-control.h"
 
 void tdnbd_fdreceiver_start();
+void tdnbd_fdreceiver_stop();
 
 static void
 usage(const char *app, int err)
@@ -149,6 +150,7 @@ main(int argc, char *argv[])
 	err = tapdisk_server_run();
 
 out:
+	tdnbd_fdreceiver_stop();
 	tapdisk_control_close();
 	tapdisk_stop_logging();
 	return -err;