diff --git a/src/Api/Monetization/Controller/AcceptedRatePlanController.php b/src/Api/Monetization/Controller/AcceptedRatePlanController.php
index f9257bf..0005a42 100644
--- a/src/Api/Monetization/Controller/AcceptedRatePlanController.php
+++ b/src/Api/Monetization/Controller/AcceptedRatePlanController.php
@@ -121,6 +121,8 @@ public function updateSubscription(AcceptedRatePlanInterface $acceptedRatePlan,
         if (null !== $waveTerminationCharge) {
             $tmp['waveTerminationCharge'] = $waveTerminationCharge ? 'true' : 'false';
         }
+        // @TODO: This is just a workaround for incorrect developer ID issue see: https://github.com/apigee/apigee-client-php/issues/36
+        $tmp['developer']['id'] = $acceptedRatePlan->getDeveloper()->getEmail();
         $payload = json_encode($tmp);
         // Update an existing entity.
         $response = $this->client->put($this->getEntityEndpointUri($acceptedRatePlan->id()), $payload);