diff --git a/agent.go b/agent.go
index 65bf1fb6..59dbe80b 100644
--- a/agent.go
+++ b/agent.go
@@ -484,7 +484,9 @@ func (a *Agent) connectivityChecks() {
 
 		select {
 		case <-a.forceCandidateContact:
-			t.Stop()
+			if !t.Stop() {
+				<-t.C
+			}
 			contact()
 		case <-t.C:
 			contact()