diff --git a/application/controllers/Qslprint.php b/application/controllers/Qslprint.php
index 9ed492eec..ae4fceea5 100644
--- a/application/controllers/Qslprint.php
+++ b/application/controllers/Qslprint.php
@@ -197,6 +197,16 @@ class QSLPrint extends CI_Controller {
 		$this->load->view('oqrs/showoqrs', $data);
 	}
 
+	public function get_previous_qsl() {
+		$id = $this->security->xss_clean($this->input->post('id'));
+
+		$this->load->model('qslprint_model');
+
+		$number_qsls = $this->qslprint_model->get_previous_qsls($id);
+		header('Content-Type: application/json');
+		echo json_encode($number_qsls);
+	}
+
 }
 
 /* End of file Qslprint.php */
diff --git a/application/models/Qslprint_model.php b/application/models/Qslprint_model.php
index 8fab52775..bfaedf738 100644
--- a/application/models/Qslprint_model.php
+++ b/application/models/Qslprint_model.php
@@ -146,6 +146,26 @@ class Qslprint_model extends CI_Model {
 		return $query;
 	}
 
+	function get_previous_qsls($qso_id) {
+		if (empty($qso_id)) {
+			return 0;
+		}
+	
+		$table_name = $this->config->item('table_name');
+		$sql = "SELECT COUNT(COL_PRIMARY_KEY) AS previous_qsl 
+				FROM $table_name 
+				WHERE COL_QSL_SENT = 'Y'
+				AND station_id = (SELECT station_id FROM $table_name WHERE COL_PRIMARY_KEY = ?)
+				AND (COL_CALL, COL_MODE, COL_BAND, COALESCE(COL_SAT_NAME, '')) = 
+					(SELECT COL_CALL, COL_MODE, COL_BAND, COALESCE(COL_SAT_NAME, '') 
+					 FROM $table_name 
+					 WHERE COL_PRIMARY_KEY = ?)
+				GROUP BY COL_CALL, COL_MODE, COL_BAND, COL_SAT_NAME";
+	
+		// we only return the count of previous QSLs as an integer
+		return (int) $this->db->query($sql, [$qso_id, $qso_id])->row()->previous_qsl;
+	}
+
 	function show_oqrs($id) {
 		$this->db->select('requesttime as "Request time", requestcallsign as "Requester", email as "Email", note as "Note"');
 		$this->db->join('station_profile', 'station_profile.station_id = oqrs.station_id');
diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php
index db288a769..a9245606b 100644
--- a/application/views/qslprint/qsolist.php
+++ b/application/views/qslprint/qsolist.php
@@ -197,7 +197,6 @@ if ($qsos->result() != NULL) {
 		}
 		echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="addQsoToPrintQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-success">' . __("Add to print queue") . '</button></td>';
 		echo '</tr>';
-		echo '<span style="display: none;" id="previous_qsl_'.$qsl->COL_PRIMARY_KEY.'">'; if ($qsl->previous_qsl > 0 ) { echo '<span class="badge bg-warning">' . $qsl->previous_qsl . '</span>'; } else { echo '<span class="badge bg-success">0</span>'; } echo '</span>';
 	}
 
 	echo '</tbody></table>';
diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js
index ad50d2994..308b1ea72 100644
--- a/assets/js/sections/qslprint.js
+++ b/assets/js/sections/qslprint.js
@@ -1,3 +1,5 @@
+let qsoDialogInstance = null;
+
 function deleteFromQslQueue(id) {
 	BootstrapDialog.confirm({
 		title: 'DANGER',
@@ -25,7 +27,7 @@ function openQsoList(callsign) {
 		type: 'post',
 		data: {'callsign': callsign},
 		success: function(html) {
-			BootstrapDialog.show({
+			qsoDialogInstance = BootstrapDialog.show({
 				title: 'QSO List',
 				size: BootstrapDialog.SIZE_WIDE,
 				cssClass: 'qso-dialog',
@@ -46,51 +48,76 @@ function openQsoList(callsign) {
 }
 
 function addQsoToPrintQueue(id) {
-	$.ajax({
-		url: base_url + 'index.php/qslprint/add_qso_to_print_queue',
-		type: 'post',
-		data: {'id': id},
-		success: function(html) {
-			var callSign = $("#qsolist_"+id).find("td:eq(0)").text();
-			var formattedCallSign = callSign.replace(/0/g, "Ø").toUpperCase();
-			var line = '<tr id="qslprint_'+id+'">';
-			line += '<td style=\'text-align: center\'><div class="form-check"><input class="form-check-input" type="checkbox" /></div></td>';
-			line += '<td style="text-align: center">';
-			line += '<span class="qso_call">';
-			line += '<a id="edit_qso" href="javascript:displayQso(' + id + ');">';
-			line += formattedCallSign;
-			line += '</a>';
-			line += '<a target="_blank" href="https://www.qrz.com/db/' + formattedCallSign + '">';
-			line += '<img width="16" height="16" src="' + base_url + 'images/icons/qrz.png" alt="Lookup ' + formattedCallSign + ' on QRZ.com">';
-			line += '</a> ';
-			line += '<a target="_blank" href="https://www.hamqth.com/' + formattedCallSign + '">';
-			line += '<img width="16" height="16" src="' + base_url + 'images/icons/hamqth.png" alt="Lookup ' + formattedCallSign + ' on HamQTH">';
-			line += '</a> ';
-			line += '<a target="_blank" href="http://www.eqsl.cc/Member.cfm?' + formattedCallSign + '">';
-			line += '<img width="16" height="16" src="' + base_url + 'images/icons/eqsl.png" alt="Lookup ' + formattedCallSign + ' on eQSL.cc">';
-			line += '</a>';
-			line += '</span>';
-			line += '</td>';
+    $.ajax({
+        url: base_url + 'index.php/qslprint/get_previous_qsl',
+        type: 'post',
+        data: { 'id': id },
+        success: function(result) {
+            let prev_qsl = result;
+            let prev_qsl_html;
 
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(1)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(2)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(3)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(4)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(5)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(6)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(9)").text()+'</td>';
-			line += '<td style=\'text-align: center\'><span class="badge text-bg-light">'+$("#qsolist_"+id).find("td:eq(7)").text()+'</span></td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(8)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(10)").text()+'</td>';
-			line += '<td style=\'text-align: center\'>'+$("#previous_qsl_"+id).html()+'</td>';
-			line += '<td style=\'text-align: center\'><button onclick="mark_qsl_sent('+id+', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
-			line += '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue('+id+')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td></td>';
-			line += '<td style=\'text-align: center\'><button onclick="openQsoList(\''+$("#qsolist_"+id).find("td:eq(0)").text()+'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
-			line += '</tr>';
-			$('#qslprint_table tr:last').after(line);
-			$("#qsolist_"+id).remove();''
-		}
-	});
+            if (prev_qsl > 0) {
+                prev_qsl_html = '<span class="badge bg-warning">' + prev_qsl + '</span>';
+            } else {
+                prev_qsl_html = '<span class="badge bg-success">0</span>';
+            }
+
+            $.ajax({
+                url: base_url + 'index.php/qslprint/add_qso_to_print_queue',
+                type: 'post',
+				data: {'id': id},
+                success: function(html) {
+					if (qsoDialogInstance) {
+                        qsoDialogInstance.close();
+                    }
+                    var callSign = $("#qsolist_"+id).find("td:eq(0)").text();
+                    var formattedCallSign = callSign.replace(/0/g, "Ø").toUpperCase();
+                    var line = '<tr id="qslprint_'+id+'">';
+					line += '<td style=\'text-align: center\'><div class="form-check"><input class="form-check-input" type="checkbox" /></div></td>';
+                    line += '<td style="text-align: center">';
+                    line += '<span class="qso_call">';
+                    line += '<a id="edit_qso" href="javascript:displayQso(' + id + ');">';
+                    line += formattedCallSign;
+                    line += '</a>';
+                    line += '<a target="_blank" href="https://www.qrz.com/db/' + formattedCallSign + '">';
+                    line += '<img width="16" height="16" src="' + base_url + 'images/icons/qrz.png" alt="Lookup ' + formattedCallSign + ' on QRZ.com">';
+                    line += '</a> ';
+                    line += '<a target="_blank" href="https://www.hamqth.com/' + formattedCallSign + '">';
+                    line += '<img width="16" height="16" src="' + base_url + 'images/icons/hamqth.png" alt="Lookup ' + formattedCallSign + ' on HamQTH">';
+                    line += '</a> ';
+                    line += '<a target="_blank" href="http://www.eqsl.cc/Member.cfm?' + formattedCallSign + '">';
+                    line += '<img width="16" height="16" src="' + base_url + 'images/icons/eqsl.png" alt="Lookup ' + formattedCallSign + ' on eQSL.cc">';
+                    line += '</a>';
+                    line += '</span>';
+                    line += '</td>';
+
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(1)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(2)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(3)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(4)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(5)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(6)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(9)").text()+'</td>';
+					line += '<td style=\'text-align: center\'><span class="badge text-bg-light">'+$("#qsolist_"+id).find("td:eq(7)").text()+'</span></td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(8)").text()+'</td>';
+					line += '<td style=\'text-align: center\'>'+$("#qsolist_"+id).find("td:eq(10)").text()+'</td>';
+					line += '<td style="text-align: center">'+prev_qsl_html+'</td>';
+					line += '<td style=\'text-align: center\'><button onclick="mark_qsl_sent('+id+', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
+					line += '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue('+id+')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td></td>';
+					line += '<td style=\'text-align: center\'><button onclick="openQsoList(\''+$("#qsolist_"+id).find("td:eq(0)").text()+'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
+                    line += '</tr>';
+                    $('#qslprint_table tr:last').after(line);
+                    $("#qsolist_"+id).remove();
+                },
+                error: function() {
+                    console.error('Error adding QSO to print queue.');
+                }
+            });
+        },
+        error: function() {
+            console.error('Error fetching previous QSL.');
+        }
+    });
 }
 
 $(".station_id").change(function(){