diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 9b140185a..c6ecb5fff 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -345,27 +345,13 @@
             </div>
 
             <div class="mb-3">
-              <?php
-              $CI = &get_instance();
-              $CI->load->library('subdivisions');
-
-              //$subdivision_name = $CI->subdivisions->get_primary_subdivision_name($qso->COL_DXCC);  // TODO Show different subdivision name based on callsign dxcc
-              $state_list = $CI->subdivisions->get_state_list('291');                                 // USA hardcoded at the moment
-              ?>
-              <label for="stateDropdown"><?php echo lang('gen_hamradio_usa_state'); ?></label>
-              <select class="form-select" id="stateDropdown" name="input_state_edit">
-                <option value=""></option>
-                <?php foreach ($state_list->result() as $state) {
-                  $selected = ($qso->COL_STATE == $state->state) ? 'selected="selected"' : '';
-                ?>
-                  <option value="<?php echo $state->state; ?>" <?php echo $selected; ?>>
-                    <?php echo $state->subdivision . ' (' . $state->state . ')'; ?>
-                  </option>
-                <?php } ?>
-              </select>
+              <label for="stateInput" id="stateInputLabel"></label>
+                <select class="form-select" name="input_state_edit" id="stateDropdown">
+                  <option value=""></option>
+                </select>
             </div>
 
-            <div class="mb-3">
+            <div class="mb-3" id="location_us_county">
                 <label for="stationCntyInput"><?php echo lang('gen_hamradio_county_reference'); ?></label>
                 <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="county" value="" />
             </div>
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index 9ee878543..6e3c11424 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -308,7 +308,7 @@ function qso_edit(id) {
                     $('.modal-content #qslmsg').keyup(function(event) {
                         calcRemainingChars(event, '.modal-content');
                     });
-                    console.log('script is running');
+                    
                     $("#dxcc_id").change(function () {
                         updateStateDropdown();
                     });
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 5f78c65da..6b335c616 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1,6 +1,7 @@
 $( document ).ready(function() {
 	clearTimeout();
 	set_timers();
+	updateStateDropdown();
 
 	function set_timers() {
 		setTimeout(function() {
@@ -581,6 +582,7 @@ function reset_fields() {
 	$('.callsign-suggest').hide();
 	$('.dxccsummary').remove();
 	$('#timesWorked').html(lang_qso_title_previous_contacts);
+	updateStateDropdown();
 }
 
 function resetTimers(manual) {
@@ -715,6 +717,7 @@ $("#callsign").focusout(function() {
 				}
 
 				$('#dxcc_id').val(result.dxcc.adif);
+				updateStateDropdown();
 				$('#cqz').val(result.dxcc.cqz);
 				$('#ituz').val(result.dxcc.ituz);
 
@@ -1080,6 +1083,38 @@ $("#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("");