diff --git a/src/FilamentJalaliServiceProvider.php b/src/FilamentJalaliServiceProvider.php
index fc45e33..9beb7a3 100644
--- a/src/FilamentJalaliServiceProvider.php
+++ b/src/FilamentJalaliServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Ariaieboy\Jalali\Jalali;
 use Filament\Forms\Components\DateTimePicker;
-use Filament\Infolists\Components\Entry;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Support\Assets\AlpineComponent;
 use Filament\Support\Facades\FilamentAsset;
@@ -73,14 +72,15 @@ public function packageBooted(): void
 
         TextEntry::macro('jalaliDate', function (?string $format = null, ?string $timezone = null) {
             $format ??= config('filament-jalali.date_format');
+            $timezone ??= $this->getTimezone();
 
-            $this->formatStateUsing(static function (Entry $entry, $state) use ($format, $timezone): ?string {
+            $this->formatStateUsing(static function ($state) use ($format, $timezone): ?string {
                 if (blank($state)) {
                     return null;
                 }
 
                 return Jalali::fromCarbon(Carbon::parse($state)
-                    ->setTimezone($timezone ?? $entry->getTimezone()))
+                    ->setTimezone($timezone))
                     ->format($format);
             });