diff --git a/app/Models/TenantPackage.php b/app/Models/TenantPackage.php
index 8d460f4..77cab1a 100644
--- a/app/Models/TenantPackage.php
+++ b/app/Models/TenantPackage.php
@@ -97,8 +97,8 @@ class TenantPackage extends Model
                 if (! $tenantPackage->expires_at) {
                     $tenantPackage->expires_at = now()->addYear();
                 }
-            } else {
-                $tenantPackage->expires_at = now()->addCentury();
+            } elseif (! $tenantPackage->expires_at) {
+                $tenantPackage->expires_at = now()->addYear();
             }
 
             if ($tenantPackage->active === null) {
@@ -120,10 +120,6 @@ class TenantPackage extends Model
 
                 return;
             }
-
-            if ($tenantPackage->isDirty('expires_at')) {
-                $tenantPackage->expires_at = now()->addCentury();
-            }
         });
     }
 }
diff --git a/app/Services/Checkout/CheckoutAssignmentService.php b/app/Services/Checkout/CheckoutAssignmentService.php
index f0fd5e4..1f25e56 100644
--- a/app/Services/Checkout/CheckoutAssignmentService.php
+++ b/app/Services/Checkout/CheckoutAssignmentService.php
@@ -110,7 +110,7 @@ class CheckoutAssignmentService
             if ($package->type !== 'reseller') {
                 $tenant->forceFill([
                     'subscription_status' => 'active',
-                    'subscription_expires_at' => $tenantPackage->expires_at,
+                    'subscription_expires_at' => null,
                 ])->save();
             }
 
diff --git a/tests/Unit/TenantPackageTest.php b/tests/Unit/TenantPackageTest.php
index 2efd508..517416c 100644
--- a/tests/Unit/TenantPackageTest.php
+++ b/tests/Unit/TenantPackageTest.php
@@ -17,7 +17,7 @@ class TenantPackageTest extends TestCase
 
         $tenantPackage = TenantPackage::factory()->create([
             'package_id' => $package->id,
-            'expires_at' => now()->subYear(),
+            'expires_at' => null,
             'active' => true,
         ]);
 
@@ -25,7 +25,9 @@ class TenantPackageTest extends TestCase
 
         $this->assertTrue($tenantPackage->isActive());
         $this->assertTrue($tenantPackage->active);
-        $this->assertTrue($tenantPackage->expires_at->greaterThan(now()->addYears(50)));
+        $this->assertNotNull($tenantPackage->expires_at);
+        $this->assertTrue($tenantPackage->expires_at->isFuture());
+        $this->assertTrue($tenantPackage->expires_at->lessThanOrEqualTo(now()->addYears(2)));
     }
 
     public function test_reseller_packages_still_expire(): void