diff --git a/src/grpc/server.rs b/src/grpc/server.rs
index 9f60512..8830c21 100644
--- a/src/grpc/server.rs
+++ b/src/grpc/server.rs
@@ -163,10 +163,11 @@ impl Update for NodeServer {
 
             let error_status: Status; // Gets initialized inside loop
             let mut timeout = interval(state.get_timeout());
+            timeout.tick().await;
             loop {
                 tokio::select! {
                     Some(msg) = inbound.next() => {
-                        timeout = interval(state.get_timeout());
+                        timeout.reset();
                         match msg {
                             Ok(update) => {
                                 if update.ip == remote_ip {