diff --git a/src/connection.c b/src/connection.c
index f86afde..ad523b9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -573,7 +573,7 @@
 		goto out_wait;
 
 	if (ret < 0) {
-		if (errno == EAGAIN)
+		if (errno == EAGAIN || errno == ENOTCONN)
 			goto out_wait;
 		goto out_error;
 	}
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 33f1d0e..6a21c64 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -468,7 +468,7 @@
 			goto out_wait;
 
 		if (ret < 0) {
-			if (errno == EAGAIN)
+			if (errno == EAGAIN || errno == ENOTCONN)
 				goto out_wait;
 			goto out_error;
 		}