diff --git a/Server/appsettings.json b/Server/appsettings.json
index 2d21280..4f52399 100644
--- a/Server/appsettings.json
+++ b/Server/appsettings.json
@@ -10,7 +10,8 @@
   "Transport": {
     "StartStation": "Zurich",
     "EndStation": "Basel",
-    "ApiBaseUrl": "http://transport.opendata.ch/v1"
+    "ApiBaseUrl": "http://transport.opendata.ch/v1",
+    "SafetyBufferMinutes": 30
   },
 
   "Shifts": [
diff --git a/Services/TransportService.cs b/Services/TransportService.cs
index 639465b..4ad60dd 100644
--- a/Services/TransportService.cs
+++ b/Services/TransportService.cs
@@ -21,8 +21,8 @@ namespace ShiftScheduler.Services
                 var endStation = customEndStation ?? _config.EndStation;
                 var arrivalTimeStr = arrivalTime.ToString("HH:mm");
                 
-                // Calculate departure time (assume 30 minutes before arrival for safety)
-                var searchTime = arrivalTime.AddMinutes(-30);
+                // Calculate departure time (use configured safety buffer)
+                var searchTime = arrivalTime.AddMinutes(-_config.SafetyBufferMinutes);
                 var searchTimeStr = searchTime.ToString("yyyy-MM-dd");
                 var searchHourStr = searchTime.ToString("HH:mm");
 
diff --git a/Shared/TransportModels.cs b/Shared/TransportModels.cs
index 1b133a4..a31f824 100644
--- a/Shared/TransportModels.cs
+++ b/Shared/TransportModels.cs
@@ -12,6 +12,7 @@ namespace ShiftScheduler.Shared.Models
         public string StartStation { get; set; } = string.Empty;
         public string EndStation { get; set; } = string.Empty;
         public string ApiBaseUrl { get; set; } = string.Empty;
+        public int SafetyBufferMinutes { get; set; } = 30;
     }
 
     public class TransportConnection