diff --git a/test/api/unit/libs/payments/stripe/subscriptions.test.js b/test/api/unit/libs/payments/stripe/subscriptions.test.js
index c135f94b276..3955037c020 100644
--- a/test/api/unit/libs/payments/stripe/subscriptions.test.js
+++ b/test/api/unit/libs/payments/stripe/subscriptions.test.js
@@ -173,6 +173,7 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId: null,
+        autoRenews: true,
       });
     });
 
@@ -197,6 +198,7 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId,
+        autoRenews: true,
       });
     });
 
@@ -231,6 +233,7 @@ describe('Stripe - Subscriptions', () => {
         paymentMethod: 'Stripe',
         sub: sinon.match({ ...sub }),
         groupId,
+        autoRenews: true,
       });
     });
   });
diff --git a/website/server/libs/payments/stripe/subscriptions.js b/website/server/libs/payments/stripe/subscriptions.js
index dc17450cb6b..baa2488d1c1 100644
--- a/website/server/libs/payments/stripe/subscriptions.js
+++ b/website/server/libs/payments/stripe/subscriptions.js
@@ -35,7 +35,12 @@ export async function checkSubData (sub, isGroup = false, coupon) {
 
 export async function applySubscription (session) {
   const { metadata, customer: customerId, subscription: subscriptionId } = session;
-  const { sub: subStringified, userId, groupId, gift } = metadata;
+  const {
+    sub: subStringified,
+    userId,
+    groupId,
+    gift,
+  } = metadata;
 
   const sub = subStringified ? JSON.parse(subStringified) : undefined;
 
@@ -49,7 +54,7 @@ export async function applySubscription (session) {
     sub,
     groupId,
     subscriptionId,
-    autoRenews: Boolean(gift),
+    autoRenews: gift ? false : true,
   });
 }