diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index ea05fb441..40efd1562 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -63,6 +63,14 @@ $( document ).ready(function() {
 		}
 	});
 
+	// Sanitize some input data
+	$('#callsign').on('input', function() {
+		$(this).val($(this).val().replace(/\s/g, ''));
+	});
+	$('#locator').on('input', function() {
+		$(this).val($(this).val().replace(/\s/g, ''));
+	});
+
 	$('.callsign-suggest').hide();
 
 	setRst($(".mode").val());