diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index d0bbcdb5..25b13034 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -1534,6 +1534,15 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
 
         $odometer_reading = $req->request->get('odometer');
 
+        if ($odometer_reading > 999999)
+        {
+            $data = [
+                'title' => 'Failed Set Odometer',
+                'error' => 'Odometer cannot be more than 6 figures.',
+            ];
+            return $data;
+        }
+
         $jo->addMeta('odometer', $odometer_reading);
 
         $this->em->flush();