diff --git a/application/views/stationsetup/linkedlocations.php b/application/views/stationsetup/linkedlocations.php
index 16a4caf0e..4bf17d311 100644
--- a/application/views/stationsetup/linkedlocations.php
+++ b/application/views/stationsetup/linkedlocations.php
@@ -22,7 +22,7 @@
 
 <input type="hidden" class="form-control" id="station_logbook_id" name="station_logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>" required>
 
-<button class="btn btn-sm btn-primary" onclick="linkLocations();"><i class="fas fa-link"></i> <?php echo lang('station_logbooks_link_loc'); ?></button>
+<button class="btn btn-sm btn-primary linkLocationButton" onclick="linkLocations();"><i class="fas fa-link"></i> <?php echo lang('station_logbooks_link_loc'); ?></button>
 <br /><br />
 
 <table id="station_logbooks_linked_table" class="table table-hover table-sm table-striped">
@@ -43,7 +43,7 @@
 			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_profile_name;?></td>
 			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_callsign;?></td>
 			<td style="text-align: center; vertical-align: middle;"><?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge text-bg-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
-			<td style="text-align: center; vertical-align: middle;"><button class="btn btn-sm btn-danger" onclick="unLinkLocations('<?php echo $station_logbook_details->logbook_id; ?>','<?php echo $row->station_id;?>')"><i class="fas fa-unlink"></i></button>
+			<td style="text-align: center; vertical-align: middle;"><button class="btn btn-sm btn-danger unlinkbutton" onclick="unLinkLocations('<?php echo $station_logbook_details->logbook_id; ?>','<?php echo $row->station_id;?>')"><i class="fas fa-unlink"></i></button>
 		</tr>
 		<?php
 				}
diff --git a/assets/js/sections/stationsetup.js b/assets/js/sections/stationsetup.js
index 187e650d9..2d7315c01 100644
--- a/assets/js/sections/stationsetup.js
+++ b/assets/js/sections/stationsetup.js
@@ -516,6 +516,7 @@ function loadLocationTable(rows) {
 }
 
 function linkLocations() {
+	$('.linkLocationButton').prop("disabled", true);
 	var locationid = $('#StationLocationSelect').val();
 	var containerid = $('#station_logbook_id').val();
 	var locationtext = $('#StationLocationSelect option:selected').text();
@@ -533,26 +534,28 @@ function linkLocations() {
 		success: function(data) {
 			jdata=JSON.parse(data);
 			if (jdata.success == 1) {
-				console.log(jdata);
 				$("#StationLocationSelect").find('[value="'+ locationid +'"]').remove();
 				// add to table
 				$('#station_logbooks_linked_table').append($('<tr id="locationid_'+locationid+'">')
 					.append($('<td style="text-align: center; vertical-align: middle;">').append(jdata.locationdata[0].station_profile_name))
 					.append($('<td style="text-align: center; vertical-align: middle;">').append(jdata.locationdata[0].station_callsign))
 					.append($('<td style="text-align: center; vertical-align: middle;">').append(jdata.locationdata[0].station_country+(jdata.locationdata[0].dxcc_end == null ? '' : ' <span class="badge bg-danger">Deleted DXCC</span>')))
-					.append($('<td style="text-align: center; vertical-align: middle;">').append('<button class="btn btn-sm btn-danger" onclick="unLinkLocations('+containerid+','+locationid+');"><i class="fas fa-unlink"></i></button>'))
+					.append($('<td style="text-align: center; vertical-align: middle;">').append('<button class="btn btn-sm btn-danger unlinkbutton" onclick="unLinkLocations('+containerid+','+locationid+');"><i class="fas fa-unlink"></i></button>'))
 				)
 			} else {
 				$("#flashdata").html(jdata.flashdata);
 			}
+			$('.linkLocationButton').prop("disabled", false);
 		},
 		error: function(e) {
 			$("#flashdata").html("An unknown Error occured");
+			$('.linkLocationButton').prop("disabled", false);
 		}
 	});
 }
 
 function unLinkLocations(containerid, locationid) {
+	$('.unlinkbutton').prop("disabled", true);
 	$.ajax({
 		url: base_url + 'index.php/stationsetup/unLinkLocations',
 		type: 'post',
@@ -571,8 +574,10 @@ function unLinkLocations(containerid, locationid) {
 				);
 				$('#StationLocationSelect').append(items.join( "" ));
 				$('#locationid_'+locationid).remove();
+				$('.unlinkbutton').prop("disabled", false);
 			} else {
 				$("#flashdata").data(jdata.flashdata);
+				$('.unlinkbutton').prop("disabled", false);
 			}
 		},
 		error: function(e) {