diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index edce3485c390..771934ada212 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -61,12 +61,12 @@
 	var/flight_duration =  is_flyby ? DROPSHIP_TRANSIT_DURATION / GLOB.ship_alt : DROPSHIP_TRANSIT_DURATION * GLOB.ship_alt
 	if(optimised)
 		if(is_flyby)
-			flight_duration = DROPSHIP_TRANSIT_DURATION * 1.5
+			flight_duration *= 1.5
 		else
-			flight_duration = DROPSHIP_TRANSIT_DURATION * SHUTTLE_OPTIMIZE_FACTOR_TRAVEL
+			flight_duration *= SHUTTLE_OPTIMIZE_FACTOR_TRAVEL
 
 	// recharge time before dropship can take off
-	var/recharge_duration = SHUTTLE_RECHARGE * GLOB.ship_alt
+	var/recharge_duration = SHUTTLE_RECHARGE
 
 	if(optimised)
 		recharge_duration = SHUTTLE_RECHARGE * SHUTTLE_OPTIMIZE_FACTOR_RECHARGE