diff --git a/agent.go b/agent.go
index fb0c342257..8e8ddbeb11 100644
--- a/agent.go
+++ b/agent.go
@@ -192,7 +192,6 @@ func (c *controller) agentSetup() error {
 	if remoteAddr != "" {
 		if err := c.agentJoin(remoteAddr); err != nil {
 			logrus.Errorf("Error in agentJoin : %v", err)
-			return nil
 		}
 	}