diff --git a/src/ClassicTestStart.js b/src/ClassicTestStart.js
index b9614ea..69a7566 100644
--- a/src/ClassicTestStart.js
+++ b/src/ClassicTestStart.js
@@ -65,7 +65,7 @@ export default function ClassicTestStart(props) {
 					icon={<ArrowForwardRoundedIcon />}
 					className="button--round continue-button"
 					loading={props.loading}
-					disabled={props.disabled}
+					disabled={props.disabled || props.loading}
 				></Button>
 
 				<Button
diff --git a/src/LivesTestStart.js b/src/LivesTestStart.js
index 80c6e5b..8826c7a 100644
--- a/src/LivesTestStart.js
+++ b/src/LivesTestStart.js
@@ -65,7 +65,7 @@ export default function LivesTestStart(props) {
 					icon={<ArrowForwardRoundedIcon />}
 					className="button--round continue-button"
 					loading={props.loading}
-					disabled={props.disabled}
+					disabled={props.disabled || props.loading}
 				></Button>
 
 				<Button