diff --git a/libcontainerd/remote_daemon.go b/libcontainerd/remote_daemon.go
index 35ccc0e4a9..cc98456ba5 100644
--- a/libcontainerd/remote_daemon.go
+++ b/libcontainerd/remote_daemon.go
@@ -307,7 +307,9 @@ func (r *remote) monitorConnection(monitor *containerd.Client) {
 			<-time.After(100 * time.Millisecond)
 			system.KillProcess(r.daemonPid)
 		}
-		<-r.daemonWaitCh
+		if r.daemonWaitCh != nil {
+			<-r.daemonWaitCh
+		}
 
 		monitor.Close()
 		os.Remove(r.GRPC.Address)