diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 4b60ac1..5a93251 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -115,8 +115,7 @@
 
   section: Section = 'Team Selection';
   @Input() matchNumber: number = 1;
-  // TODO(phil): Change the type of teamNumber to a string.
-  @Input() teamNumber: number = 1;
+  @Input() teamNumber: string = '1';
   @Input() setNumber: number = 1;
   @Input() compLevel: CompLevel = 'qm';
   @Input() skipTeamSelection = false;
@@ -173,7 +172,7 @@
     if (this.teamNumber == null) {
       return false;
     }
-    const teamNumber = this.teamNumber.toString();
+    const teamNumber = this.teamNumber;
 
     for (const match of this.matchList) {
       if (
@@ -392,7 +391,7 @@
         actionOffsets.push(actionOffset);
       }
     }
-    const teamNumberFb = builder.createString(this.teamNumber.toString());
+    const teamNumberFb = builder.createString(this.teamNumber);
     const compLevelFb = builder.createString(this.compLevel);
 
     const actionsVector = SubmitActions.createActionsListVector(