diff --git a/src/middleware/console-status-verification.ts b/src/middleware/console-status-verification.ts
index c67c86e..d5fcacc 100644
--- a/src/middleware/console-status-verification.ts
+++ b/src/middleware/console-status-verification.ts
@@ -42,6 +42,21 @@ async function consoleStatusVerificationMiddleware(request: express.Request, res
 		return;
 	}
 
+	const certificateDeviceID = parseInt(request.certificate.certificateName.slice(2).split('-')[0], 16);
+
+	if (deviceID !== certificateDeviceID) {
+		// TODO - Change this to a different error
+		response.status(400).send(xmlbuilder.create({
+			error: {
+				cause: 'Bad Request',
+				code: '1600',
+				message: 'Unable to process request'
+			}
+		}).end());
+
+		return;
+	}
+
 	const serialNumber = getValueFromHeaders(request.headers, 'x-nintendo-serial-number');
 
 	// TODO - Verify serial numbers somehow?
@@ -122,21 +137,6 @@ async function consoleStatusVerificationMiddleware(request: express.Request, res
 		return;
 	}
 
-	const certificateDeviceID = parseInt(request.certificate.certificateName.slice(2).split('-')[0], 16);
-
-	if (deviceID !== certificateDeviceID) {
-		// TODO - Change this to a different error
-		response.status(400).send(xmlbuilder.create({
-			error: {
-				cause: 'Bad Request',
-				code: '1600',
-				message: 'Unable to process request'
-			}
-		}).end());
-
-		return;
-	}
-
 	if (device.access_level < 0) {
 		response.status(400).send(xmlbuilder.create({
 			errors: {