diff --git a/src/Core/Billing/Services/Implementations/SubscriberService.cs b/src/Core/Billing/Services/Implementations/SubscriberService.cs
index 564cb4bebe..9db5b2e57b 100644
--- a/src/Core/Billing/Services/Implementations/SubscriberService.cs
+++ b/src/Core/Billing/Services/Implementations/SubscriberService.cs
@@ -1132,16 +1132,15 @@ public class SubscriberService(
 
             // Ensure user ID is in metadata
             updatedMetadata[MetadataKeys.UserId] = previousPremiumUserId.ToString();
+            updatedMetadata.Remove(MetadataKeys.OrganizationId);
 
             // STEP 6: Update Stripe subscription
-            var updateOptions = new SubscriptionUpdateOptions
+            await stripeAdapter.UpdateSubscriptionAsync(subscription.Id, new SubscriptionUpdateOptions
             {
                 Items = subscriptionItemOptions,
-                TrialEnd = SubscriptionTrialEnd.Now, // End the trial immediately
+                TrialEnd = periodEnd,
                 Metadata = updatedMetadata
-            };
-
-            await stripeAdapter.UpdateSubscriptionAsync(subscription.Id, updateOptions);
+            });
 
             // STEP 7: Update user's Premium status and storage
             user.Premium = true;