diff --git a/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.html b/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.html
index 04511d23..fd9a965f 100644
--- a/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.html
+++ b/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.html
@@ -35,9 +35,9 @@ <h3><strong>Are you ready?</strong></h3>
     <div class="d-flex align-items-center justify-content-center" *ngIf="!isDoubleChecking">
         <ng-container *ngIf="ctx.game.requireSynchronizedStart">
             <button *ngIf="isConnectedToGameHub; else connectingToHub" btnCheckbox class="btn btn-lg mr-4"
+                [disabled]="isReadyingUp || !isConnectedToGameHub || playerReadyPct == 100"
                 [class.btn-outline-success]="!ctx.player.isReady" [class.btn-danger]="ctx.player.isReady"
-                [class.btn-secondary]="isReadyingUp" [(ngModel)]="ctx.player.isReady"
-                (click)="handleReadyUpdated(ctx.player)" [disabled]="isReadyingUp">
+                [class.btn-secondary]="isReadyingUp" (click)="handleReadyUpdated(ctx.player)">
                 <span>{{ ctx.player.isReady ? "Cancel - I'm not ready" : "I'm ready!" }}</span>
             </button>
         </ng-container>
diff --git a/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.ts b/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.ts
index a8636512..dfdeb591 100644
--- a/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.ts
+++ b/projects/gameboard-ui/src/app/game/components/session-start-controls/session-start-controls.component.ts
@@ -68,6 +68,7 @@ export class SessionStartControlsComponent implements OnInit {
 
   protected async handleReadyUpdated(player: Player) {
     this.isReadyingUp = true;
+    player.isReady = !player.isReady;
     this.logService.logInfo(`Player ${player.id} (user ${player.userId}) updating ready (${player.isReady})...`);
     await firstValueFrom(this.syncStartService.updatePlayerReadyState(player.id, { isReady: player.isReady }));
     this.logService.logInfo(`Player ${player.id} (user ${player.userId}) is now ${player.isReady ? "" : "NOT "}ready.`);
diff --git a/projects/gameboard-ui/src/app/services/notification.service.ts b/projects/gameboard-ui/src/app/services/notification.service.ts
index 453ea281..f10b668b 100644
--- a/projects/gameboard-ui/src/app/services/notification.service.ts
+++ b/projects/gameboard-ui/src/app/services/notification.service.ts
@@ -10,7 +10,6 @@ import { AuthService, AuthTokenState } from '../utility/auth.service';
 import { UserService } from '../api/user.service';
 import { HubPlayer, Player, TimeWindow } from '../api/player-models';
 import { LogService } from './log.service';
-import { LocalStorageService } from './local-storage.service';
 import { ExternalGameService } from './external-game.service';
 
 @Injectable({ providedIn: 'root' })
diff --git a/projects/gameboard-ui/src/app/sponsors/components/sponsor-select/sponsor-select.component.html b/projects/gameboard-ui/src/app/sponsors/components/sponsor-select/sponsor-select.component.html
index ba3f7c8d..e19e1435 100644
--- a/projects/gameboard-ui/src/app/sponsors/components/sponsor-select/sponsor-select.component.html
+++ b/projects/gameboard-ui/src/app/sponsors/components/sponsor-select/sponsor-select.component.html
@@ -12,7 +12,7 @@
         <em>
             <strong>NOTE:</strong>
             If your sponsor isn't represented here, please
-            <a href="/support/create" target="_blank">file a support ticket</a>.
+            <a routerLink="/support/create" target="_blank">file a support ticket</a>.
         </em>
     </p>
 </div>