diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 4cd76bcf6..89d71d9d4 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -596,9 +596,9 @@ $(function () {
 
 <script>
 $(document).ready(function() {
-	$('#create_station_profile #country').val($("#dxcc_select option:selected").text());
-	$("#create_station_profile #dxcc_select" ).change(function() {
-	$('#country').val($("#dxcc_select option:selected").text());
+	$('#create_station_profile #country').val($("#dxcc_id option:selected").text());
+	$("#create_station_profile #dxcc_id" ).change(function() {
+	$('#country').val($("#dxcc_id option:selected").text());
 
 	});
 });
@@ -606,20 +606,20 @@ $(document).ready(function() {
 
 <script>
 function printWarning() {
-    if ($("#dxcc_select option:selected").text().includes("<?php echo lang('gen_hamradio_deleted_dxcc'); ?>")) {
+    if ($("#dxcc_id option:selected").text().includes("<?php echo lang('gen_hamradio_deleted_dxcc'); ?>")) {
         $('#warningMessageDXCC').show();
-        $('#dxcc_select').css('border', '2px solid rgb(217, 83, 79)');
+        $('#dxcc_id').css('border', '2px solid rgb(217, 83, 79)');
         $('#warningMessageDXCC').text("<?php echo lang('station_location_dxcc_warning'); ?>");
     } else {
-        $('#dxcc_select').css('border', '');
+        $('#dxcc_id').css('border', '');
         $('#warningMessageDXCC').hide();
     }
 }
-$('#dxcc_select').ready(function() {
+$('#dxcc_id').ready(function() {
     printWarning();
 });
 
-$('#dxcc_select').on('change', function() {
+$('#dxcc_id').on('change', function() {
     printWarning();
 });
 </script>
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index a2f96c42b..ba0f0941c 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -48,7 +48,7 @@
 		  <div class="mb-3">
 		    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
 				<?php if ($dxcc_list->num_rows() > 0) { ?>
-				<select class="form-select" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
+				<select class="form-select" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected><?php echo "- " . lang('general_word_none') . " -"; ?></option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.lang('gen_hamradio_deleted_dxcc').')';?>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 0efef6671..49499864c 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -68,7 +68,7 @@
 					<div class="mb-3">
 					    <label for="stationDXCCInput"><?php echo lang("station_location_dxcc"); ?></label>
 					    <?php if ($dxcc_list->num_rows() > 0) { ?>
-					        <select class="form-select" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
+					        <select class="form-select" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
 					            <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?php echo "- " . lang('general_word_none') . " -"; ?></option>
 					            <?php foreach ($dxcc_list->result() as $dxcc) { ?>
 					                <?php $isDeleted = $dxcc->end !== NULL; ?>
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index 6e3c11424..0249d5bf4 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -312,44 +312,44 @@ function qso_edit(id) {
                     $("#dxcc_id").change(function () {
                         updateStateDropdown();
                     });
-                    // updateStateDropdown();
-                    function updateStateDropdown() {
-                        console.log('dropdown triggered');
-                        var selectedDxcc = $("#dxcc_id");
-
-                        if (selectedDxcc.val() !== "") {
-                            $.ajax({
-                                url: base_url + "index.php/lookup/get_state_list",
-                                type: "POST",
-                                data: { dxcc: selectedDxcc.val() },
-                                success: function (response) {
-                                    if (response.status === "ok") {
-                                        statesDropdown(response, set_state);
-                                        $('#stateInputLabel').html(response.subdivision_name);
-                                    } else {
-                                        statesDropdown(response);
-                                        $('#stateInputLabel').html('State');
-                                    }
-                                },
-                                error: function () {
-                                    console.log('ERROR', response.status);
-                                },
-                            });
-                        } 
-
-                        if (selectedDxcc.val() == '291' || selectedDxcc.val() == '110' || selectedDxcc.val() == '6') {
-                            $("#location_us_county").show();
-                        } else {
-                            $("#location_us_county").hide();
-                            $("#stationCntyInputEdit").val();
-                        }
-                    }
                 },
             });
         }
     });
 }
 
+function updateStateDropdown() {
+    console.log('dropdown triggered');
+    var selectedDxcc = $("#dxcc_id");
+
+    if (selectedDxcc.val() !== "") {
+        $.ajax({
+            url: base_url + "index.php/lookup/get_state_list",
+            type: "POST",
+            data: { dxcc: selectedDxcc.val() },
+            success: function (response) {
+                if (response.status === "ok") {
+                    statesDropdown(response, set_state);
+                    $('#stateInputLabel').html(response.subdivision_name);
+                } else {
+                    statesDropdown(response);
+                    $('#stateInputLabel').html('State');
+                }
+            },
+            error: function () {
+                console.log('ERROR', response.status);
+            },
+        });
+    } 
+
+    if (selectedDxcc.val() == '291' || selectedDxcc.val() == '110' || selectedDxcc.val() == '6') {
+        $("#location_us_county").show();
+    } else {
+        $("#location_us_county").hide();
+        $("#stationCntyInputEdit").val();
+    }
+}
+
 function spawnQrbCalculator(locator1, locator2) {
 	$.ajax({
 		url: base_url + 'index.php/qrbcalc',
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 872795523..d9abacf11 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1087,38 +1087,6 @@ $("#callsign").keyup(function() {
 	}
   });
 
-  function updateStateDropdown() {
-	console.log('dropdown triggered');
-	var selectedDxcc = $("#dxcc_id");
-
-	if (selectedDxcc.val() !== "") {
-		$.ajax({
-			url: base_url + "index.php/lookup/get_state_list",
-			type: "POST",
-			data: { dxcc: selectedDxcc.val() },
-			success: function (response) {
-				if (response.status === "ok") {
-					statesDropdown(response, set_state);
-					$('#stateInputLabel').html(response.subdivision_name);
-				} else {
-					statesDropdown(response);
-					$('#stateInputLabel').html('State');
-				}
-			},
-			error: function () {
-				console.log('ERROR', response.status);
-			},
-		});
-	} 
-
-	if (selectedDxcc.val() == '291' || selectedDxcc.val() == '110' || selectedDxcc.val() == '6') {
-		$("#location_us_county").show();
-	} else {
-		$("#location_us_county").hide();
-		$("#stationCntyInputEdit").val();
-	}
-}
-
 //Reset QSO form Fields function
 function resetDefaultQSOFields() {
 	$('#callsign_info').text("");
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js
index c8b4d023d..a94854993 100644
--- a/assets/js/sections/station_locations.js
+++ b/assets/js/sections/station_locations.js
@@ -9,38 +9,9 @@ $(document).ready(function () {
 	if (window.location.pathname.indexOf("/station/edit") !== -1 || window.location.pathname.indexOf("/station/create") !== -1) {
 		selectize_usa_county();
 		updateStateDropdown();
-		$("#dxcc_select").change(function () {
+		$("#dxcc_id").change(function () {
 			updateStateDropdown();
 		});
 	}
 });
 
-function updateStateDropdown() {
-	var selectedDxcc = $("#dxcc_select");
-
-	if (selectedDxcc.val() !== "") {
-		$.ajax({
-			url: base_url + "index.php/lookup/get_state_list",
-			type: "POST",
-			data: { dxcc: selectedDxcc.val() },
-			success: function (response) {
-				if (response.status === "ok") {
-					statesDropdown(response, set_state);
-                    $('#stateInputLabel').html(response.subdivision_name);
-				} else {
-                    statesDropdown(response);
-					$('#stateInputLabel').html('State');
-                }
-			},
-			error: function () {
-				console.log('ERROR', response.status);
-			},
-		});
-	} 
-
-    if (selectedDxcc.val() == '291' || selectedDxcc.val() == '110' || selectedDxcc.val() == '6') {
-        $("#location_us_county").show();
-    } else {
-        $("#location_us_county").hide();
-    }
-}