diff --git a/app/DataMapper/Billing/BillingContextMapper.php b/app/DataMapper/Billing/BillingContextMapper.php
new file mode 100644
index 000000000000..3d878f38841e
--- /dev/null
+++ b/app/DataMapper/Billing/BillingContextMapper.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\DataMapper\Billing;
+
+
+class BillingContextMapper
+{
+    /**
+     * @var int
+     */
+    public $billing_subscription_id;
+
+    /**
+     * @var string
+     */
+    public $email;
+
+    /**
+     * @var int
+     */
+    public $client_id;
+
+    /**
+     * @var int
+     */
+    public $invoice_id;
+
+    /**
+     * @var string[]
+     */
+    public $casts = [
+        'billing_subscription_id' => 'integer',
+        'email' => 'string',
+        'client_id' => 'integer',
+        'invoice_id' => 'integer',
+    ];
+}
diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index aa98fdc17da6..950065bd8551 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -284,8 +284,7 @@ class BillingPortalPurchase extends Component
             'billing_subscription_id' => $this->billing_subscription->id,
             'email' => $this->email ?? $this->contact->email,
             'client_id' => $this->contact->client->id,
-            'invoice_id' => $this->invoice->id,
-            'subscription_id' => $this->billing_subscription->id],
+            'invoice_id' => $this->invoice->id],
             now()->addMinutes(60)
         );