diff --git a/composer.json b/composer.json
index 6267b1f..f9cf117 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.32",
+    "version": "1.6.33",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",
diff --git a/src/Traits/HasApiModelBehavior.php b/src/Traits/HasApiModelBehavior.php
index bd1a2b2..0ff49f4 100644
--- a/src/Traits/HasApiModelBehavior.php
+++ b/src/Traits/HasApiModelBehavior.php
@@ -64,13 +64,11 @@ protected function invalidateApiCacheOnChange(): void
         }
 
         // Get company UUID if available
-        $companyUuid = session('company');
-        if (isset($this->company_uuid)) {
-            $companyUuid = $this->company_uuid;
-        }
+        $companyUuid = session('company', $this->company_uuid);
 
         // Use ApiModelCache if available
         ApiModelCache::invalidateModelCache($this, $companyUuid);
+        ApiModelCache::invalidateModelCache(new self(), $companyUuid);
     }
 
     /**