diff --git a/src/NuttyTree.NetDaemon.Application/ElectronicsTime/gRPC/ElectronicsTimeGrpcService.cs b/src/NuttyTree.NetDaemon.Application/ElectronicsTime/gRPC/ElectronicsTimeGrpcService.cs
index 0b40358..ddf459c 100644
--- a/src/NuttyTree.NetDaemon.Application/ElectronicsTime/gRPC/ElectronicsTimeGrpcService.cs
+++ b/src/NuttyTree.NetDaemon.Application/ElectronicsTime/gRPC/ElectronicsTimeGrpcService.cs
@@ -68,7 +68,7 @@ public override async Task GetStatus(StatusRequest request, IServerStreamWriter<
         while (!context.CancellationToken.IsCancellationRequested)
         {
             // We have to recreate the timer each time because the time to next daytime change can vary based on Daylight Saving Time
-            using var daytimeChange = new Timer(_ => updateStatusTrigger.TrySetResult(), null, GetTimeToNextDaytimeChange(), TimeSpan.MaxValue);
+            using var daytimeChange = new Timer(_ => updateStatusTrigger.TrySetResult(), null, GetTimeToNextDaytimeChange(), TimeSpan.FromDays(1));
 
             var response = new StatusResponse
             {