diff --git a/field/arena.go b/field/arena.go
index b428e23c..a3c112ff 100644
--- a/field/arena.go
+++ b/field/arena.go
@@ -59,30 +59,32 @@ type Arena struct {
 	ScoringPanelRegistry
 	ArenaNotifiers
 	MatchState
-	lastMatchState             MatchState
-	CurrentMatch               *model.Match
-	MatchStartTime             time.Time
-	LastMatchTimeSec           float64
-	RedRealtimeScore           *RealtimeScore
-	BlueRealtimeScore          *RealtimeScore
-	lastDsPacketTime           time.Time
-	lastPeriodicTaskTime       time.Time
-	EventStatus                EventStatus
-	FieldReset                 bool
-	AudienceDisplayMode        string
-	SavedMatch                 *model.Match
-	SavedMatchResult           *model.MatchResult
-	SavedRankings              game.Rankings
-	AllianceStationDisplayMode string
-	AllianceSelectionAlliances []model.Alliance
-	PlayoffTournament          *playoff.PlayoffTournament
-	LowerThird                 *model.LowerThird
-	ShowLowerThird             bool
-	MuteMatchSounds            bool
-	matchAborted               bool
-	soundsPlayed               map[*game.MatchSound]struct{}
-	breakDescription           string
-	preloadedTeams             *[6]*model.Team
+	lastMatchState                    MatchState
+	CurrentMatch                      *model.Match
+	MatchStartTime                    time.Time
+	LastMatchTimeSec                  float64
+	RedRealtimeScore                  *RealtimeScore
+	BlueRealtimeScore                 *RealtimeScore
+	lastDsPacketTime                  time.Time
+	lastPeriodicTaskTime              time.Time
+	EventStatus                       EventStatus
+	FieldReset                        bool
+	AudienceDisplayMode               string
+	SavedMatch                        *model.Match
+	SavedMatchResult                  *model.MatchResult
+	SavedRankings                     game.Rankings
+	AllianceStationDisplayMode        string
+	AllianceSelectionAlliances        []model.Alliance
+	AllianceSelectionShowTimer        bool
+	AllianceSelectionTimeRemainingSec int
+	PlayoffTournament                 *playoff.PlayoffTournament
+	LowerThird                        *model.LowerThird
+	ShowLowerThird                    bool
+	MuteMatchSounds                   bool
+	matchAborted                      bool
+	soundsPlayed                      map[*game.MatchSound]struct{}
+	breakDescription                  string
+	preloadedTeams                    *[6]*model.Team
 }
 
 type AllianceStation struct {
diff --git a/field/arena_notifiers.go b/field/arena_notifiers.go
index f917eddb..46fdffff 100644
--- a/field/arena_notifiers.go
+++ b/field/arena_notifiers.go
@@ -65,7 +65,15 @@ func (arena *Arena) configureNotifiers() {
 }
 
 func (arena *Arena) generateAllianceSelectionMessage() any {
-	return &arena.AllianceSelectionAlliances
+	return &struct {
+		Alliances        []model.Alliance
+		ShowTimer        bool
+		TimeRemainingSec int
+	}{
+		arena.AllianceSelectionAlliances,
+		arena.AllianceSelectionShowTimer,
+		arena.AllianceSelectionTimeRemainingSec,
+	}
 }
 
 func (arena *Arena) generateAllianceStationDisplayModeMessage() any {
diff --git a/static/js/alliance_selection.js b/static/js/alliance_selection.js
new file mode 100644
index 00000000..75e40e96
--- /dev/null
+++ b/static/js/alliance_selection.js
@@ -0,0 +1,32 @@
+// Copyright 2024 Team 254. All Rights Reserved.
+// Author: pat@patfairbank.com (Patrick Fairbank)
+//
+// Client-side logic for the alliance selection page.
+
+var websocket;
+
+// Sends a websocket message to show the timer.
+const showTimer = function() {
+  websocket.send("showTimer");
+};
+
+// Sends a websocket message to hide the timer.
+const hideTimer = function() {
+  websocket.send("hideTimer");
+}
+
+// Handles a websocket message to update the alliance selection status.
+const handleAllianceSelection = function(data) {
+  $("#timer").text(getCountdownString(data.TimeRemainingSec));
+};
+
+$(function() {
+  // Activate playoff tournament datetime picker.
+  const startTime = moment(new Date()).hour(13).minute(0).second(0);
+  newDateTimePicker("startTimePicker", startTime.toDate());
+
+  // Set up the websocket back to the server.
+  websocket = new CheesyWebsocket("/alliance_selection/websocket", {
+    allianceSelection: function(event) { handleAllianceSelection(event.data); },
+  });
+});
diff --git a/static/js/audience_display.js b/static/js/audience_display.js
index 667b98b7..710de9ca 100644
--- a/static/js/audience_display.js
+++ b/static/js/audience_display.js
@@ -139,12 +139,7 @@ const handleMatchLoad = function(data) {
 // Handles a websocket message to update the match time countdown.
 const handleMatchTime = function(data) {
   translateMatchTime(data, function(matchState, matchStateText, countdownSec) {
-    let countdownString = String(countdownSec % 60);
-    if (countdownString.length === 1) {
-      countdownString = "0" + countdownString;
-    }
-    countdownString = Math.floor(countdownSec / 60) + ":" + countdownString;
-    $("#matchTime").text(countdownString);
+    $("#matchTime").text(getCountdownString(countdownSec));
   });
 };
 
@@ -325,7 +320,8 @@ const handlePlaySound = function(sound) {
 };
 
 // Handles a websocket message to update the alliance selection screen.
-const handleAllianceSelection = function(alliances) {
+const handleAllianceSelection = function(data) {
+  const alliances = data.Alliances;
   if (alliances && alliances.length > 0) {
     const numColumns = alliances[0].TeamIds.length + 1;
     $.each(alliances, function(k, v) {
@@ -333,6 +329,12 @@ const handleAllianceSelection = function(alliances) {
     });
     $("#allianceSelection").html(allianceSelectionTemplate({alliances: alliances, numColumns: numColumns}));
   }
+
+  if (data.ShowTimer) {
+    $("#allianceSelectionTimer").text(getCountdownString(data.TimeRemainingSec));
+  } else {
+    $("#allianceSelectionTimer").html(" ");
+  }
 };
 
 // Handles a websocket message to populate and/or show/hide a lower third.
diff --git a/static/js/match_timing.js b/static/js/match_timing.js
index 9056abd3..486255ef 100644
--- a/static/js/match_timing.js
+++ b/static/js/match_timing.js
@@ -9,7 +9,7 @@ const matchTypePractice = 1;
 const matchTypeQualification = 2;
 const matchTypePlayoff = 3;
 
-var matchStates = {
+const matchStates = {
   0: "PRE_MATCH",
   1: "START_MATCH",
   2: "WARMUP_PERIOD",
@@ -20,16 +20,16 @@ var matchStates = {
   7: "TIMEOUT_ACTIVE",
   8: "POST_TIMEOUT"
 };
-var matchTiming;
+let matchTiming;
 
 // Handles a websocket message containing the length of each period in the match.
-var handleMatchTiming = function(data) {
+const handleMatchTiming = function(data) {
   matchTiming = data;
 };
 
 // Converts the raw match state and time into a human-readable state and per-period time. Calls the provided
 // callback with the result.
-var translateMatchTime = function(data, callback) {
+const translateMatchTime = function(data, callback) {
   var matchStateText;
   switch (matchStates[data.MatchState]) {
     case "PRE_MATCH":
@@ -60,7 +60,7 @@ var translateMatchTime = function(data, callback) {
 };
 
 // Returns the per-period countdown for the given match state and overall time into the match.
-var getCountdown = function(matchState, matchTimeSec) {
+const getCountdown = function(matchState, matchTimeSec) {
   switch (matchStates[matchState]) {
     case "PRE_MATCH":
     case "START_MATCH":
@@ -77,3 +77,12 @@ var getCountdown = function(matchState, matchTimeSec) {
       return 0;
   }
 };
+
+// Converts the given countdown in seconds to a string with a colon separator and leading zero padding.
+const getCountdownString = function(countdownSec) {
+  let countdownString = String(countdownSec % 60);
+  if (countdownString.length === 1) {
+    countdownString = "0" + countdownString;
+  }
+  return Math.floor(countdownSec / 60) + ":" + countdownString;
+};
diff --git a/static/js/wall_display.js b/static/js/wall_display.js
index a25b4e77..3c6070b1 100644
--- a/static/js/wall_display.js
+++ b/static/js/wall_display.js
@@ -130,12 +130,7 @@ const handleMatchLoad = function(data) {
 // Handles a websocket message to update the match time countdown.
 const handleMatchTime = function(data) {
   translateMatchTime(data, function(matchState, matchStateText, countdownSec) {
-    let countdownString = String(countdownSec % 60);
-    if (countdownString.length === 1) {
-      countdownString = "0" + countdownString;
-    }
-    countdownString = Math.floor(countdownSec / 60) + ":" + countdownString;
-    $("#matchTime").text(countdownString);
+    $("#matchTime").text(getCountdownString(countdownSec));
   });
 };
 
diff --git a/templates/alliance_selection.html b/templates/alliance_selection.html
index 4084370d..612a859e 100644
--- a/templates/alliance_selection.html
+++ b/templates/alliance_selection.html
@@ -76,6 +76,35 @@
           </tbody>
         </table>
         Hint: Press 'Enter' after entering each team number for easiest use.
+        <div class="card card-body bg-body-secondary mt-4">
+          <div class="row">
+            <div class="col-lg-8">
+              <legend>Selection Timer</legend>
+            </div>
+            <div class="col-lg-4 text-end">
+              <legend id="timer"></legend>
+            </div>
+          </div>
+          <p>
+            Timer starts automatically after each non-captain assignment and is hidden on the audience overlay until
+            the button below is pressed.
+          </p>
+          <div class="row">
+            <label class="col-lg-5 control-label">Time limit in seconds<br />(0 = disabled)</label>
+            <div class="col-lg-3">
+              <input type="text" class="form-control" name="timeLimitSec" value="{{.TimeLimitSec}}">
+            </div>
+            <div class="col-lg-4 text-end">
+              <button type="submit" class="btn btn-primary">Save/Reset</button>
+            </div>
+          </div>
+          <div class="mt-3 row justify-content-center">
+            <div class="col-lg-8 text-center">
+              <button type="button" class="btn btn-success" onclick="showTimer();">Show Timer</button>
+              <button type="button" class="btn btn-secondary" onclick="hideTimer();">Hide Timer</button>
+            </div>
+          </div>
+        </div>
       </form>
     </div>
     <div class="col-lg-2">
@@ -149,6 +178,8 @@ <h4 class="modal-title">Confirm</h4>
 </div>
 {{end}}
 {{define "script"}}
+<script src="/static/js/match_timing.js"></script>
+<script src="/static/js/alliance_selection.js"></script>
 <script>
   $(function() {
     var startTime = moment(new Date()).hour(13).minute(0).second(0);
diff --git a/templates/audience_display.html b/templates/audience_display.html
index 5c4867d9..c6f6ee14 100644
--- a/templates/audience_display.html
+++ b/templates/audience_display.html
@@ -257,6 +257,9 @@
             {{"{{/each}}"}}
           </tr>
         {{"{{/each}}"}}
+        <tr>
+          <td id="allianceSelectionTimer" colspan="{{"{{numColumns}}"}}"></td>
+        </tr>
       </table>
     </script>
     <script id="sponsorImageTemplate" type="text/x-handlebars-template">
diff --git a/web/alliance_selection.go b/web/alliance_selection.go
index 10ba94f4..49513760 100644
--- a/web/alliance_selection.go
+++ b/web/alliance_selection.go
@@ -9,6 +9,9 @@ import (
 	"fmt"
 	"github.com/Team254/cheesy-arena/model"
 	"github.com/Team254/cheesy-arena/tournament"
+	"github.com/Team254/cheesy-arena/websocket"
+	"io"
+	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -23,6 +26,12 @@ type RankedTeam struct {
 // Global var to hold the team rankings during the alliance selection.
 var cachedRankedTeams []*RankedTeam
 
+// Global var to hold configurable time limit for selections. A value of zero disables the timer.
+var allianceSelectionTimeLimitSec = 0
+
+// Global var to hold a ticker used for the alliance selection timer.
+var allianceSelectionTicker *time.Ticker
+
 // Shows the alliance selection page.
 func (web *Web) allianceSelectionGetHandler(w http.ResponseWriter, r *http.Request) {
 	if !web.userIsAdmin(w, r) {
@@ -43,6 +52,9 @@ func (web *Web) allianceSelectionPostHandler(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
+	// Update time limit value.
+	allianceSelectionTimeLimitSec, _ = strconv.Atoi(r.PostFormValue("timeLimitSec"))
+
 	// Reset picked state for each team in preparation for reconstructing it.
 	newRankedTeams := make([]*RankedTeam, len(cachedRankedTeams))
 	for i, team := range cachedRankedTeams {
@@ -90,6 +102,25 @@ func (web *Web) allianceSelectionPostHandler(w http.ResponseWriter, r *http.Requ
 	}
 	cachedRankedTeams = newRankedTeams
 
+	if allianceSelectionTicker != nil {
+		allianceSelectionTicker.Stop()
+		web.arena.AllianceSelectionShowTimer = false
+		web.arena.AllianceSelectionTimeRemainingSec = 0
+	}
+	if _, nextCol := web.determineNextCell(); nextCol > 0 && allianceSelectionTimeLimitSec > 0 {
+		web.arena.AllianceSelectionTimeRemainingSec = allianceSelectionTimeLimitSec
+		allianceSelectionTicker = time.NewTicker(time.Second)
+		go func() {
+			for range allianceSelectionTicker.C {
+				web.arena.AllianceSelectionTimeRemainingSec--
+				web.arena.AllianceSelectionNotifier.Notify()
+				if web.arena.AllianceSelectionTimeRemainingSec == 0 {
+					allianceSelectionTicker.Stop()
+				}
+			}
+		}()
+	}
+
 	web.arena.AllianceSelectionNotifier.Notify()
 	http.Redirect(w, r, "/alliance_selection", 303)
 }
@@ -254,6 +285,47 @@ func (web *Web) allianceSelectionFinalizeHandler(w http.ResponseWriter, r *http.
 	http.Redirect(w, r, "/match_play", 303)
 }
 
+// The websocket endpoint for the alliance selection client to send control commands and receive status updates.
+func (web *Web) allianceSelectionWebsocketHandler(w http.ResponseWriter, r *http.Request) {
+	if !web.userIsAdmin(w, r) {
+		return
+	}
+
+	ws, err := websocket.NewWebsocket(w, r)
+	if err != nil {
+		handleWebErr(w, err)
+		return
+	}
+	defer ws.Close()
+
+	// Subscribe the websocket to the notifiers whose messages will be passed on to the client, in a separate goroutine.
+	go ws.HandleNotifiers(web.arena.AllianceSelectionNotifier)
+
+	// Loop, waiting for commands and responding to them, until the client closes the connection.
+	for {
+		messageType, _, err := ws.Read()
+		if err != nil {
+			if err == io.EOF {
+				// Client has closed the connection; nothing to do here.
+				return
+			}
+			log.Println(err)
+			return
+		}
+
+		switch messageType {
+		case "showTimer":
+			web.arena.AllianceSelectionShowTimer = true
+			web.arena.AllianceSelectionNotifier.Notify()
+		case "hideTimer":
+			web.arena.AllianceSelectionShowTimer = false
+			web.arena.AllianceSelectionNotifier.Notify()
+		default:
+			ws.WriteError(fmt.Sprintf("Invalid message type '%s'.", messageType))
+		}
+	}
+}
+
 func (web *Web) renderAllianceSelection(w http.ResponseWriter, r *http.Request, errorMessage string) {
 	if len(web.arena.AllianceSelectionAlliances) == 0 {
 		// The application may have been restarted since the alliance selection was conducted; try reloading the
@@ -279,7 +351,16 @@ func (web *Web) renderAllianceSelection(w http.ResponseWriter, r *http.Request,
 		NextRow      int
 		NextCol      int
 		ErrorMessage string
-	}{web.arena.EventSettings, web.arena.AllianceSelectionAlliances, cachedRankedTeams, nextRow, nextCol, errorMessage}
+		TimeLimitSec int
+	}{
+		web.arena.EventSettings,
+		web.arena.AllianceSelectionAlliances,
+		cachedRankedTeams,
+		nextRow,
+		nextCol,
+		errorMessage,
+		allianceSelectionTimeLimitSec,
+	}
 	err = template.ExecuteTemplate(w, "base", data)
 	if err != nil {
 		handleWebErr(w, err)
diff --git a/web/alliance_selection_test.go b/web/alliance_selection_test.go
index 2b6ae74f..532dea25 100644
--- a/web/alliance_selection_test.go
+++ b/web/alliance_selection_test.go
@@ -6,6 +6,9 @@ package web
 import (
 	"github.com/Team254/cheesy-arena/game"
 	"github.com/Team254/cheesy-arena/model"
+	"github.com/Team254/cheesy-arena/websocket"
+	gorillawebsocket "github.com/gorilla/websocket"
+	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
@@ -309,3 +312,31 @@ func TestAllianceSelectionAutofocus(t *testing.T) {
 	assert.Equal(t, -1, i)
 	assert.Equal(t, -1, j)
 }
+
+func TestAllianceSelectionWebsocket(t *testing.T) {
+	web := setupTestWeb(t)
+
+	server, wsUrl := web.startTestServer()
+	defer server.Close()
+	conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/alliance_selection/websocket", nil)
+	assert.Nil(t, err)
+	defer conn.Close()
+	ws := websocket.NewTestWebsocket(conn)
+
+	// Should get a status update right after connection.
+	readWebsocketType(t, ws, "allianceSelection")
+
+	// Test showing and hiding the timer.
+	allianceSelectionMessage := struct {
+		ShowTimer bool
+	}{}
+	ws.Write("showTimer", nil)
+	assert.Nil(t, mapstructure.Decode(readWebsocketType(t, ws, "allianceSelection"), &allianceSelectionMessage))
+	assert.Equal(t, true, allianceSelectionMessage.ShowTimer)
+	ws.Write("hideTimer", nil)
+	assert.Nil(t, mapstructure.Decode(readWebsocketType(t, ws, "allianceSelection"), &allianceSelectionMessage))
+	assert.Equal(t, false, allianceSelectionMessage.ShowTimer)
+	ws.Write("showTimer", nil)
+	assert.Nil(t, mapstructure.Decode(readWebsocketType(t, ws, "allianceSelection"), &allianceSelectionMessage))
+	assert.Equal(t, true, allianceSelectionMessage.ShowTimer)
+}
diff --git a/web/web.go b/web/web.go
index 565a54d9..05a00945 100644
--- a/web/web.go
+++ b/web/web.go
@@ -123,11 +123,11 @@ func addNoCacheHeader(handler http.Handler) http.Handler {
 
 // Sets up the mapping between URLs and handlers.
 func (web *Web) newHandler() http.Handler {
-
 	mux := http.NewServeMux()
 	mux.HandleFunc("GET /", web.indexHandler)
 	mux.HandleFunc("GET /alliance_selection", web.allianceSelectionGetHandler)
 	mux.HandleFunc("POST /alliance_selection", web.allianceSelectionPostHandler)
+	mux.HandleFunc("GET /alliance_selection/websocket", web.allianceSelectionWebsocketHandler)
 	mux.HandleFunc("POST /alliance_selection/finalize", web.allianceSelectionFinalizeHandler)
 	mux.HandleFunc("POST /alliance_selection/reset", web.allianceSelectionResetHandler)
 	mux.HandleFunc("POST /alliance_selection/start", web.allianceSelectionStartHandler)