diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 290e2fb..50d0cd9 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -127,6 +127,7 @@
   progressMessage: string = '';
   errorMessage: string = '';
   autoPhase: boolean = true;
+  mobilityCompleted: boolean = false;
   lastObject: ObjectType = null;
 
   preScouting: boolean = false;
@@ -202,6 +203,10 @@
       action.timestamp = Date.now() * 1e6 - this.matchStartTimestamp;
     }
 
+    if (action.type == 'mobilityAction') {
+      this.mobilityCompleted = true;
+    }
+
     if (
       action.type == 'pickupObjectAction' ||
       action.type == 'placeObjectAction'
diff --git a/scouting/www/entry/entry.ng.html b/scouting/www/entry/entry.ng.html
index e189ab0..3bc21e5 100644
--- a/scouting/www/entry/entry.ng.html
+++ b/scouting/www/entry/entry.ng.html
@@ -142,7 +142,7 @@
         CUBE
       </button>
       <button
-        *ngIf="autoPhase"
+        *ngIf="autoPhase && !mobilityCompleted"
         class="btn btn-light"
         (click)="addAction({type: 'mobilityAction', mobility: true});"
       >
@@ -223,7 +223,7 @@
         LOW
       </button>
       <button
-        *ngIf="autoPhase"
+        *ngIf="autoPhase && !mobilityCompleted"
         class="btn btn-light"
         (click)="addAction({type: 'mobilityAction', mobility: true});"
       >