diff --git a/app/Listeners/Subscription/AppStoreRenewSubscription.php b/app/Listeners/Subscription/AppStoreRenewSubscription.php
index 958fd6292..4ab490e37 100644
--- a/app/Listeners/Subscription/AppStoreRenewSubscription.php
+++ b/app/Listeners/Subscription/AppStoreRenewSubscription.php
@@ -59,10 +59,6 @@ class AppStoreRenewSubscription implements ShouldQueue
 
         $account->save();
 
-        // $server_notification = $event->getServerNotification();
-        // $subscription = $event->getSubscription();
-        // $subscription_identifier = $event->getSubscriptionIdentifier();
-
     }
 
 }
\ No newline at end of file
diff --git a/app/Listeners/Subscription/PlayStoreRenewSubscription.php b/app/Listeners/Subscription/PlayStoreRenewSubscription.php
new file mode 100644
index 000000000..75a1561c9
--- /dev/null
+++ b/app/Listeners/Subscription/PlayStoreRenewSubscription.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Listeners\Subscription;
+
+use Carbon\Carbon;
+use App\Models\Account;
+use App\Models\Company;
+use App\Libraries\MultiDB;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Notifications\Ninja\RenewalFailureNotification;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRenewed;
+
+class PlayStoreRenewSubscription implements ShouldQueue
+{
+    public function handle(SubscriptionRenewed $event)
+    {
+        $notification = $event->getServerNotification();
+        nlog("google");
+        nlog($notification);
+        $in_app_identifier = $event->getSubscriptionIdentifier();
+
+        MultiDB::findAndSetDbByInappTransactionId($in_app_identifier);
+
+        $expirationTime = $event->getSubscription()->getExpiryTime();
+
+        $account = Account::where('inapp_transaction_id', $in_app_identifier)->first();
+
+        if ($account) {
+            $account->update(['plan_expires' => Carbon::parse($expirationTime)]);
+        }
+
+        if (!$account) {
+            $ninja_company = Company::on('db-ninja-01')->find(config('ninja.ninja_default_company_id'));
+            $ninja_company->notification(new RenewalFailureNotification("{$in_app_identifier}"))->ninja();
+            return;
+        }
+    }
+
+
+}
diff --git a/app/Notifications/Ninja/RenewalFailureNotification.php b/app/Notifications/Ninja/RenewalFailureNotification.php
index 5dbbbe8a6..83d6651fa 100644
--- a/app/Notifications/Ninja/RenewalFailureNotification.php
+++ b/app/Notifications/Ninja/RenewalFailureNotification.php
@@ -29,7 +29,9 @@ class RenewalFailureNotification extends Notification
      * @return void
      */
 
-    public function __construct(protected string $notification_message){}
+    public function __construct(protected ?string $notification_message)
+    {
+    }
 
     /**
      * Get the notification's delivery channels.
diff --git a/config/purchase.php b/config/purchase.php
index d61999023..d740da055 100644
--- a/config/purchase.php
+++ b/config/purchase.php
@@ -1,30 +1,32 @@
 <?php
 
-use App\Listeners\Subscription\AppStoreRenewSubscription;
 use Imdhemy\Purchases\Events\AppStore\Cancel;
-use Imdhemy\Purchases\Events\AppStore\DidChangeRenewalPref;
-use Imdhemy\Purchases\Events\AppStore\DidChangeRenewalStatus;
-use Imdhemy\Purchases\Events\AppStore\DidFailToRenew;
-use Imdhemy\Purchases\Events\AppStore\DidRecover;
-use Imdhemy\Purchases\Events\AppStore\DidRenew;
-use Imdhemy\Purchases\Events\AppStore\InitialBuy;
-use Imdhemy\Purchases\Events\AppStore\InteractiveRenewal;
-use Imdhemy\Purchases\Events\AppStore\PriceIncreaseConsent;
 use Imdhemy\Purchases\Events\AppStore\Refund;
 use Imdhemy\Purchases\Events\AppStore\Revoke;
+use Imdhemy\Purchases\Events\AppStore\DidRenew;
+use Imdhemy\Purchases\Events\AppStore\DidRecover;
+use Imdhemy\Purchases\Events\AppStore\InitialBuy;
+use Imdhemy\Purchases\Events\AppStore\DidFailToRenew;
+use App\Listeners\Subscription\AppStoreRenewSubscription;
+use Imdhemy\Purchases\Events\AppStore\InteractiveRenewal;
+use App\Listeners\Subscription\PlayStoreRenewSubscription;
+use Imdhemy\Purchases\Events\AppStore\DidChangeRenewalPref;
+use Imdhemy\Purchases\Events\AppStore\PriceIncreaseConsent;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionOnHold;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPaused;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionExpired;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRenewed;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRevoked;
+use Imdhemy\Purchases\Events\AppStore\DidChangeRenewalStatus;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionCanceled;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionDeferred;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionExpired;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPurchased;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRecovered;
+use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRestarted;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionInGracePeriod;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionOnHold;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPauseScheduleChanged;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPaused;
 use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPriceChangeConfirmed;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionPurchased;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRecovered;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRenewed;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRestarted;
-use Imdhemy\Purchases\Events\GooglePlay\SubscriptionRevoked;
 
 return [
     'routing' => [],
@@ -40,7 +42,7 @@ return [
          * --------------------------------------------------------
          */
         SubscriptionPurchased::class => [],
-        SubscriptionRenewed::class => [],
+        SubscriptionRenewed::class => [PlayStoreRenewSubscription::class],
         SubscriptionInGracePeriod::class => [],
         SubscriptionExpired::class => [],
         SubscriptionCanceled::class => [],