diff --git a/src/tracking/tracking.service.ts b/src/tracking/tracking.service.ts
index 58d64b94f362a3c4e01e2a457442c6812d469551..b366784ec03f8c4f67e0ec99bbc563a292733d6f 100644
--- a/src/tracking/tracking.service.ts
+++ b/src/tracking/tracking.service.ts
@@ -16,7 +16,6 @@ export class TrackingService {
   ) {}
 
   private icons = {
-    null: 'infantry.svg',
     infantry: 'infantry.svg',
     recon: 'recon.svg',
     mechanized: 'mechanized.svg',
@@ -44,7 +43,10 @@ export class TrackingService {
       trackdata['time'] = Date.now();
       // initialize data
       trackedperson = await this.trackingrepository.create(trackedperson);
-      trackedperson.icon = this.icons[gameperson.group.class];
+      // if group exists, add icon based on that, else add default icon
+      trackedperson.icon = gameperson.group
+        ? this.icons[gameperson.group.class]
+        : 'infantry.svg';
       trackedperson.data = [trackdata];
       trackedperson.faction = gameperson.faction;
       trackedperson.game = gameId;