diff --git a/app/build.gradle b/app/build.gradle
index 625c2c4c68..47cb99297c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -574,7 +574,7 @@ dependencies {
     def work_version = "2.10.2"
     def exif_version = "1.4.1"
     def biometric_version = "1.2.0-alpha05" // 1.4.0-alpha04
-    def billingclient_version = "6.0.1" // 6.2.0
+    def billingclient_version = "7.1.1" // 8.0.0
     def playservicesbasement_version = "18.5.0";
     def transparency_version = "2.7.0"
     def javamail_version = "1.6.7"
@@ -724,6 +724,7 @@ dependencies {
     implementation "androidx.biometric:biometric:$biometric_version"
 
     // https://developer.android.com/google/play/billing/billing_library_releases_notes
+    // https://developer.android.com/google/play/billing/migrate-gpblv7
     // https://android-developers.googleblog.com/2020/06/meet-google-play-billing-library.html
     playImplementation "com.android.billingclient:billing:$billingclient_version"
 
diff --git a/app/src/play/java/eu/faircode/email/ActivityBilling.java b/app/src/play/java/eu/faircode/email/ActivityBilling.java
index 21e47fe772..98677a2c62 100644
--- a/app/src/play/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/play/java/eu/faircode/email/ActivityBilling.java
@@ -51,6 +51,7 @@ import com.android.billingclient.api.BillingFlowParams;
 import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.ConsumeParams;
 import com.android.billingclient.api.ConsumeResponseListener;
+import com.android.billingclient.api.PendingPurchasesParams;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchasesResponseListener;
 import com.android.billingclient.api.PurchasesUpdatedListener;
@@ -114,7 +115,7 @@ public class ActivityBilling extends ActivityBase implements
             try {
                 Log.i("IAB start");
                 billingClient = BillingClient.newBuilder(getApplicationContext())
-                        .enablePendingPurchases()
+                        .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
                         .setListener(this)
                         .build();
                 billingClient.startConnection(this);