diff --git a/src/lib/classes/managers/FleetManager.ts b/src/lib/classes/managers/FleetManager.ts
index bde8196..9e89497 100644
--- a/src/lib/classes/managers/FleetManager.ts
+++ b/src/lib/classes/managers/FleetManager.ts
@@ -134,7 +134,7 @@ export default class FleetManager {
 
     async initiateReturn() {
         this.data.returning = true;
-        this.data.departureTime = new Date();
+        this.data.departureTime = new Date(this.data.arrivalTime);
         this.data.arrivalTime = new Date(this.data.departureTime.getTime() + 1000 * 30);
         await this.sync();
     }