diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index 1e2257a08..ca8a3492b 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -192,7 +192,7 @@ class Satellite extends CI_Controller {
 		$this->load->model('stations');
 
 		$pageData['satellites'] = $this->satellite_model->get_all_satellites_with_tle();
-		$data['lastworkedsat'] = $this->satellite_model->get_last_worked_sat();
+		$data['selsat']=strtoupper($sat ?? $this->satellite_model->get_last_worked_sat());
 
 		$footerData = [];
 		$footerData['scripts'] = [
diff --git a/application/views/satellite/flightpath.php b/application/views/satellite/flightpath.php
index fd36cc01c..674dbba9d 100644
--- a/application/views/satellite/flightpath.php
+++ b/application/views/satellite/flightpath.php
@@ -40,7 +40,7 @@
 			<select class="form-select my-1 me-sm-2 w-auto"  id="sats" onchange="plot_sat()">
 				<?php foreach($satellites as $sat) {
 					echo '<option value="' . $sat->satname . '"';
-					if ($sat->satname == $lastworkedsat) { echo ' selected'; }
+					if ($sat->satname == $selsat) { echo ' selected'; }
 					echo '>' . $sat->satname . '</option>'."\n";
 				} ?>
 			</select>