diff --git a/src/app/components/add-game/add-game.component.html b/src/app/components/add-game/add-game.component.html
index 5f7d27f..c1ab94c 100644
--- a/src/app/components/add-game/add-game.component.html
+++ b/src/app/components/add-game/add-game.component.html
@@ -49,7 +49,8 @@
 		<div id="which-solo" class="visible-{{this.currentPage === 4}}">
 			<p>Select the Solo that has been played:</p>
 			<div class="togglebtn active-{{isSoloActive(solo)}}" *ngFor="let solo of getAllPossibleSolos()" (click)="toggleSolo(solo)">{{solo.toString()}}</div>
-			<button (click)="switchToNextPage()">Next</button>
+			<p id="solo-warn" *ngIf="noSoloSelectedYet()">Please select a solo to continue</p>
+			<button (click)="switchToNextPage()" [disabled]="noSoloSelectedYet()">Next</button>
 		</div>
 		<div id="extra-points" class="visible-{{this.currentPage === 5}}">
 			<p>Extra Points</p>
diff --git a/src/app/components/add-game/add-game.component.scss b/src/app/components/add-game/add-game.component.scss
index bd85815..854ec5e 100644
--- a/src/app/components/add-game/add-game.component.scss
+++ b/src/app/components/add-game/add-game.component.scss
@@ -30,7 +30,7 @@
 	color: $inactive;
 }
 
-#player-amount-warn, #announcement-warn, #team-warn, #score-warn {
+#player-amount-warn, #announcement-warn, #team-warn, #score-warn, #solo-warn {
 	color: $warn;
 }
 
diff --git a/src/app/components/add-game/add-game.component.ts b/src/app/components/add-game/add-game.component.ts
index 52fdfe8..b6e30d5 100644
--- a/src/app/components/add-game/add-game.component.ts
+++ b/src/app/components/add-game/add-game.component.ts
@@ -640,15 +640,40 @@ export class AddGameComponent implements OnInit {
 		return numberOfElders === 1;
 	}
 
+	/**
+	 * Checks if the given solo is currently active
+	 * @param solo The solo to check active status for
+	 */
 	isSoloActive(solo: solos.Solo): boolean {
 		return this.soloPlayed === solo;
 	}
 
+	/**
+	 * Returns all possible solo values
+	 */
 	getAllPossibleSolos(): solos.Solo[] {
 		return solos.getAllSoloValues();
 	}
 
+	/**
+	 * Toggles the given solo as the active one
+	 * @param solo The solo to set as the active one
+	 */
 	toggleSolo(solo: solos.Solo): void {
 		this.soloPlayed = solo;
 	}
+
+	noSoloSelectedYet(): boolean {
+		return this.soloPlayed === undefined;
+	}
+
+	/**
+	 *     ______     __                ____        _       __
+	 *    / ____/  __/ /__________ _   / __ \____  (_)___  / /______
+	 *   / __/ | |/_/ __/ ___/ __ `/  / /_/ / __ \/ / __ \/ __/ ___/
+	 *  / /____>  </ /_/ /  / /_/ /  / ____/ /_/ / / / / / /_(__  )
+	 * /_____/_/|_|\__/_/   \__,_/  /_/    \____/_/_/ /_/\__/____/
+	 */
+
+
 }