diff --git a/src/yggdrasil/search.go b/src/yggdrasil/search.go
index bf8c781..584a056 100644
--- a/src/yggdrasil/search.go
+++ b/src/yggdrasil/search.go
@@ -170,6 +170,7 @@ func (sinfo *searchInfo) startSearch() {
 			time.AfterFunc(search_RETRY_TIME-elapsed, cleanupFunc)
 		})
 	}
+	time.AfterFunc(search_RETRY_TIME, cleanupFunc)
 }
 
 // Calls create search, and initializes the iterative search parts of the struct before returning it.