diff --git a/application/controllers/Labels.php b/application/controllers/Labels.php
index b6b6b8ada..3d0868f1b 100644
--- a/application/controllers/Labels.php
+++ b/application/controllers/Labels.php
@@ -281,7 +281,7 @@ class Labels extends CI_Controller {
 			$qso_data[] = [
 				'time' => $qso->COL_TIME_ON,
 				'band' => $qso->COL_BAND,
-				'mode' => ($qso->COL_SUBMODE ?? $qso->COL_MODE),
+				'mode' => (($qso->COL_SUBMODE ?? '') == '') ? $qso->COL_MODE : $qso->COL_SUBMODE,
 				'rst' => $qso->COL_RST_SENT,
 				'mygrid' => $qso->station_gridsquare,
 				'via' => $qso->COL_QSL_VIA,
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 795aab5f1..25e3da928 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -3345,6 +3345,9 @@ function lotw_last_qsl_date($user_id) {
 		  $input_submode = $submode;
 	  }
 
+	  $input_submode = (($input_submode ?? '') == '') ? null : $input_submode;	// Make Sure submode is NULL if empty
+	  $input_mode = (($input_mode ?? '') == '') ? null : $input_mode;	// Make Sure mode is NULL if empty
+
 
 	  // Check if QSO is already in the database
 	  if ($skipDuplicate != NULL) {