diff --git a/src/Exceptions/FieldNotFoundException.php b/src/Exceptions/FieldNotFoundException.php
deleted file mode 100644
index f6f7b73..0000000
--- a/src/Exceptions/FieldNotFoundException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace TransformStudios\Events\Exceptions;
-
-use Exception;
-
-class FieldNotFoundException extends Exception
-{
-    public function __construct(private string $field)
-    {
-        parent::__construct("Field [{$field}] not found, please make sure you have a `timezone` field in your blueprint.");
-
-        $this->field = $field;
-    }
-}
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 1c60be4..2de2ade 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -8,10 +8,9 @@
 use Illuminate\Support\Facades\Artisan;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Site;
+use Statamic\Fields\Field;
 use Statamic\Providers\AddonServiceProvider;
 use Statamic\Statamic;
-use Statamic\Support\Arr;
-use TransformStudios\Events\Exceptions\FieldNotFoundException;
 use TransformStudios\Events\Fieldtypes\Timezones;
 use TransformStudios\Events\Modifiers\InMonth;
 use TransformStudios\Events\Modifiers\IsEndOfWeek;
@@ -81,27 +80,17 @@ private function bootCarbon(): self
 
     private function bootFields(): self
     {
-        $collectionHandle = config('events.collection', 'events');
+        Collection::computed(config('events.collection', 'events'), 'timezone', function ($entry, $value) {
+            $value ??= config('events.timezone', config('app.timezone'));
 
-        Collection::computed($collectionHandle, 'timezone', function ($entry, $value) use ($collectionHandle) {
-            if ($value) {
+            if ($entry->blueprint()->fields()->get('timezone')?->fieldtype() instanceof Timezones) {
                 return $value;
             }
 
-            $timezone = config('events.timezone', config('app.timezone'));
-
-            $collection = Collection::findByHandle($collectionHandle);
-
-            $blueprint = Arr::first($collection->entryBlueprints());
-
-            if (is_null($tzField = $blueprint->field('timezone'))) {
-                throw new FieldNotFoundException('timezone');
-            }
-
-            return $tzField
-                ->setValue($timezone)
+            return (new Field('timezone', ['type' => 'timezones', 'max_items' => 1]))
+                ->setValue($value)
+                ->setParent($entry)
                 ->augment()
-                ->value()
                 ->value();
         });