diff --git a/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs b/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
index 26a1c30c14..0bd4a405bf 100644
--- a/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
+++ b/src/Billing/Services/Implementations/SubscriptionDeletedHandler.cs
@@ -40,10 +40,15 @@ public class SubscriptionDeletedHandler : ISubscriptionDeletedHandler
             return;
         }
 
-        if (organizationId.HasValue &&
-            subscription.CancellationDetails.Comment != providerMigrationCancellationComment &&
-            !subscription.CancellationDetails.Comment.Contains(addedToProviderCancellationComment))
+        if (organizationId.HasValue)
         {
+            if (!string.IsNullOrEmpty(subscription.CancellationDetails?.Comment) &&
+                (subscription.CancellationDetails.Comment == providerMigrationCancellationComment ||
+                 subscription.CancellationDetails.Comment.Contains(addedToProviderCancellationComment)))
+            {
+                return;
+            }
+
             await _organizationService.DisableAsync(organizationId.Value, subscription.CurrentPeriodEnd);
         }
         else if (userId.HasValue)