diff --git a/ems-core/package.electron.json b/ems-core/package.electron.json
index d2c8814..ffe3a6e 100644
--- a/ems-core/package.electron.json
+++ b/ems-core/package.electron.json
@@ -2,7 +2,7 @@
   "name": "ems-core",
   "author": "The Orange Alliance",
   "description": "An improved event experience.",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "private": true,
   "main": "public/desktop/electron.js",
   "homepage": "./public/desktop/"
diff --git a/ems-core/package.json b/ems-core/package.json
index 492c841..0860893 100644
--- a/ems-core/package.json
+++ b/ems-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ems-core",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "private": true,
   "main": "public/electron.js",
   "dependencies": {
diff --git a/ems-core/src/views/match-play/containers/MatchPlay.tsx b/ems-core/src/views/match-play/containers/MatchPlay.tsx
index 816b316..a7eaa7d 100644
--- a/ems-core/src/views/match-play/containers/MatchPlay.tsx
+++ b/ems-core/src/views/match-play/containers/MatchPlay.tsx
@@ -302,6 +302,7 @@ class MatchPlay extends React.Component<IProps, IState> {
     for (const match of this.getMatchesByTournamentLevel(this.state.selectedLevel)) {
       if (match.matchKey === (props.value as string)) {
         this.props.setActiveMatch(match);
+        this.setState({activeMatch: match});
         // Temporarily set the match to what we have now, and then get ALL the details.
         MatchFlowController.getMatchResults(match.matchKey).then((data: Match) => {
           this.props.setActiveMatch(data);
diff --git a/ems-socket/src/scoring/MatchTimer.ts b/ems-socket/src/scoring/MatchTimer.ts
index 4f4d505..41506fc 100644
--- a/ems-socket/src/scoring/MatchTimer.ts
+++ b/ems-socket/src/scoring/MatchTimer.ts
@@ -107,13 +107,13 @@ export default class MatchTimer extends events.EventEmitter {
           }
       }
     } else {
-      this._modeTimeLeft--;
-      this._timeLeft--;
-
       if (this.endTime > 0 && this._timeLeft === this.endTime) {
         this.emit("match-endgame");
         logger.info("Endgame started.")
       }
+
+      this._modeTimeLeft--;
+      this._timeLeft--;
     }
   }
 
diff --git a/package.json b/package.json
index 869f3fc..9f45020 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "event-management-system",
   "description": "Hub for all programs in the EMS suite.",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "private": true,
   "scripts": {
     "api": "cd ems-api/ && npm start",