diff --git a/AppWithDeliveryTrackingSignalR/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs b/AppWithDeliveryTrackingSignalR/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
index e2ded39..59e4fa4 100644
--- a/AppWithDeliveryTrackingSignalR/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
+++ b/AppWithDeliveryTrackingSignalR/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
@@ -10,17 +10,20 @@ public class LocationUpdater(
     ExecuteAsync(
         CancellationToken cancellationToken)
     {
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.1276, cancellationToken);
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.1276, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.13, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.13, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.508, -0.14, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.508, -0.14, cancellationToken);
+        }
     }
 
     private async Task UpdateLocation(
diff --git a/AppWithOllamaChatbot/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs b/AppWithOllamaChatbot/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
index e2ded39..59e4fa4 100644
--- a/AppWithOllamaChatbot/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
+++ b/AppWithOllamaChatbot/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
@@ -10,17 +10,20 @@ public class LocationUpdater(
     ExecuteAsync(
         CancellationToken cancellationToken)
     {
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.1276, cancellationToken);
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.1276, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.13, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.13, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.508, -0.14, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.508, -0.14, cancellationToken);
+        }
     }
 
     private async Task UpdateLocation(
diff --git a/AppWithTests/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs b/AppWithTests/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
index e2ded39..59e4fa4 100644
--- a/AppWithTests/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
+++ b/AppWithTests/OnlineShop/OnlineShop.ApiService/LocationUpdater.cs
@@ -10,17 +10,20 @@ public class LocationUpdater(
     ExecuteAsync(
         CancellationToken cancellationToken)
     {
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.1276, cancellationToken);
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.1276, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.5074, -0.13, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.5074, -0.13, cancellationToken);
 
-        await Task.Delay(5000, cancellationToken);
-        await UpdateLocation(
-            51.508, -0.14, cancellationToken);
+            await Task.Delay(5000, cancellationToken);
+            await UpdateLocation(
+                51.508, -0.14, cancellationToken);
+        }
     }
 
     private async Task UpdateLocation(