diff --git a/lib/ui/payment/stripe_subscription_page.dart b/lib/ui/payment/stripe_subscription_page.dart
index a7d1da076..433146ebb 100644
--- a/lib/ui/payment/stripe_subscription_page.dart
+++ b/lib/ui/payment/stripe_subscription_page.dart
@@ -357,7 +357,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
         ),
       );
     }
-    if (!foundActivePlan) {
+    if (!foundActivePlan && _hasActiveSubscription) {
       _addCurrentPlanWidget(planWidgets);
     }
     return planWidgets;
diff --git a/lib/ui/payment/subscription_page.dart b/lib/ui/payment/subscription_page.dart
index 06d4bc03d..3e68406ec 100644
--- a/lib/ui/payment/subscription_page.dart
+++ b/lib/ui/payment/subscription_page.dart
@@ -270,7 +270,7 @@ class _SubscriptionPageState extends State<SubscriptionPage> {
         ),
       );
     }
-    if (!foundActivePlan) {
+    if (!foundActivePlan && _hasActiveSubscription) {
       _addCurrentPlanWidget(planWidgets);
     }
     return planWidgets;
diff --git a/lib/utils/diff_fetcher.dart b/lib/utils/diff_fetcher.dart
index f29b59e65..68f02c303 100644
--- a/lib/utils/diff_fetcher.dart
+++ b/lib/utils/diff_fetcher.dart
@@ -19,18 +19,17 @@ class DiffFetcher {
 
   Future<Diff> getEncryptedFilesDiff(
       int collectionID, int sinceTime, int limit) async {
-    return _dio.get(
-      Configuration.instance.getHttpEndpoint() + "/collections/diff",
-      options:
-          Options(headers: {"X-Auth-Token": Configuration.instance.getToken()}),
-      queryParameters: {
-        "collectionID": collectionID,
-        "sinceTime": sinceTime,
-        "limit": limit,
-      },
-    ).catchError((e) {
-      _logger.severe(e);
-    }).then((response) async {
+    try {
+      final response = await _dio.get(
+        Configuration.instance.getHttpEndpoint() + "/collections/diff",
+        options: Options(
+            headers: {"X-Auth-Token": Configuration.instance.getToken()}),
+        queryParameters: {
+          "collectionID": collectionID,
+          "sinceTime": sinceTime,
+          "limit": limit,
+        },
+      );
       final files = <File>[];
       if (response != null) {
         Bus.instance.fire(RemoteSyncEvent(true));
@@ -101,7 +100,10 @@ class DiffFetcher {
         Bus.instance.fire(RemoteSyncEvent(false));
         return Diff(<File>[], <File>[], 0);
       }
-    });
+    } catch (e, s) {
+      _logger.severe(e, s);
+      rethrow;
+    }
   }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 20c107a35..80498b916 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: ente photos application
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.3.30+240
+version: 0.3.32+242
 
 environment:
   sdk: ">=2.10.0 <3.0.0"