diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index 27d2888d..4f3e95e1 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -1255,13 +1255,18 @@ class RiderAppController extends APIController
 
     protected function getRiderFromCAPI($capi_user, $em)
     {
+        /*
         //get rider id from metadata
         $metadata = $capi_user->getMetadata();
         $rider_id = $metadata['rider_id'];
 
         // get rider
         $rider = $em->getRepository(Rider::class)->find($rider_id);
+
         return $rider;
+        */
+
+        return $capi_user->getRider();
     }
 
     protected function checkMissingParameters(Request $req, $params = [])