diff --git a/server/src/adsb.mjs b/server/src/adsb.mjs
index 8febfa3..600ff40 100644
--- a/server/src/adsb.mjs
+++ b/server/src/adsb.mjs
@@ -81,8 +81,10 @@ export function decodeFlags(f) {
 	};
 }
 
-const lookupAircraft = (icao) =>
-	db?.prepare(`SELECT icao, reg, type_code, flags, desc FROM aircraft WHERE icao = ?`).get(icao.toUpperCase());
+const lookupAircraft = (icao) => {
+	const clean = icao.replace(/^~/, '').toUpperCase().padStart(6, '0');
+	return db?.prepare(`SELECT icao, reg, type_code, flags, desc FROM aircraft WHERE icao = ?`).get(clean);
+}
 
 export function enrichAircraft(a) {
 	if(!a.hex) return a;