diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index 61c5617a1..c50551f27 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -300,6 +300,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) {
 	errc := make(chan error)
 	go func() {
 		errc <- corehttp.Serve(node, apiLis.NetListener(), opts...)
+		close(errc)
 	}()
 	return nil, errc
 }
@@ -355,6 +356,7 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) {
 	errc := make(chan error)
 	go func() {
 		errc <- corehttp.Serve(node, gwLis.NetListener(), opts...)
+		close(errc)
 	}()
 	return nil, errc
 }