diff --git a/resources/views/tiptap-editor.blade.php b/resources/views/tiptap-editor.blade.php
index 4cae0977..b6469a7f 100644
--- a/resources/views/tiptap-editor.blade.php
+++ b/resources/views/tiptap-editor.blade.php
@@ -4,6 +4,7 @@
     $statePath = $getStatePath();
     $isDisabled = $isDisabled();
     $blocks = $getBlocks();
+    $shouldSupportBlocks = $shouldSupportBlocks();
 @endphp
 
 @if (config('filament-tiptap-editor.extensions_script') || config('filament-tiptap-editor.extensions_styles'))
@@ -75,7 +76,7 @@ class="relative z-0 tiptap-wrapper rounded-md bg-white dark:bg-gray-900"
                                     @elseif (is_array($tool))
                                         <x-dynamic-component component="{{ $tool['button'] }}" :state-path="$statePath" />
                                     @elseif ($tool === 'blocks')
-                                        @if ($blocks)
+                                        @if ($blocks && $shouldSupportBlocks)
                                             <x-filament-tiptap-editor::tools.blocks :blocks="$blocks" :state-path="$statePath" />
                                         @endif
                                     @else
@@ -135,7 +136,7 @@ class="relative z-0 tiptap-wrapper rounded-md bg-white dark:bg-gray-900"
                             ></div>
                         </div>
 
-                        @if (count($blocks) && (! $isDisabled) && in_array('blocks', $tools))
+                        @if (! $isDisabled && $shouldSupportBlocks)
                             <div
                                 x-data="{
                                     isCollapsed: false,
diff --git a/src/Actions/SourceAction.php b/src/Actions/SourceAction.php
index 4505efbb..290e330f 100644
--- a/src/Actions/SourceAction.php
+++ b/src/Actions/SourceAction.php
@@ -31,9 +31,12 @@ protected function setUp(): void
             ->modalWidth('screen')
             ->action(function (TiptapEditor $component, $data) {
 
-                $content = tiptap_converter()->asJSON($data['source'], decoded: true);
+                $content = $data['source'];
 
-                $content = $component->renderBlockPreviews($content);
+                if ($component->shouldSupportBlocks()) {
+                    $content = tiptap_converter()->asJSON($content, decoded: true);
+                    $content = $component->renderBlockPreviews($content, $component);
+                }
 
                 $component->getLivewire()->dispatch(
                     'insert-content',
diff --git a/src/TiptapEditor.php b/src/TiptapEditor.php
index 00f97beb..dc77e2c2 100644
--- a/src/TiptapEditor.php
+++ b/src/TiptapEditor.php
@@ -51,15 +51,20 @@ protected function setUp(): void
         $this->extensions = config('filament-tiptap-editor.extensions') ?? [];
 
         $this->afterStateHydrated(function (TiptapEditor $component, string | array | null $state) {
+
             if (! $state) {
-                $component->state('<p></p>');
+                if ($this->expectsJSON()) {
+                    $component->state(null);
+                } else {
+                    $component->state('<p></p>');
+                }
                 return;
             }
 
             if ($this->getBlocks() && $this->expectsJSON()) {
                 $state = $this->renderBlockPreviews($state, $component);
-            } elseif ($this->expectsHTML()) {
-                $state = $this->getHTML();
+            } elseif ($this->expectsText()) {
+                $state = $this->getText();
             }
 
             $component->state($state);
@@ -370,4 +375,9 @@ public function verifyListener(TiptapEditor $component, string $statePath): bool
     {
         return $component->isDisabled() || $statePath !== $component->getStatePath();
     }
+
+    public function shouldSupportBlocks(): bool
+    {
+        return filled($this->getBlocks()) && $this->expectsJSON() && in_array('blocks', $this->getTools());
+    }
 }
diff --git a/tests/database/factories/PageFactory.php b/tests/database/factories/PageFactory.php
index a5632a10..2d922ba0 100644
--- a/tests/database/factories/PageFactory.php
+++ b/tests/database/factories/PageFactory.php
@@ -11,37 +11,17 @@ class PageFactory extends Factory
     protected $model = Page::class;
 
     public function definition(): array
-    {
-        return [
-            'title' => $this->faker->sentence(),
-            'html_content' => HtmlFaker::make()
-                ->heading()
-                ->paragraphs(withRandomLinks: true)
-                ->generate(),
-            'json_content' => tiptap_converter()->asJSON(
-                HtmlFaker::make()
-                    ->heading()
-                    ->paragraphs(withRandomLinks: true)
-                    ->generate()
-            ),
-            'text_content' => tiptap_converter()->asText(
-                HtmlFaker::make()
-                    ->heading()
-                    ->paragraphs(withRandomLinks: true)
-                    ->generate()
-            ),
-        ];
-    }
-
-    public function json(): Factory
     {
         $content = HtmlFaker::make()
             ->heading()
             ->paragraphs(withRandomLinks: true)
             ->generate();
 
-        return $this->state(fn () => [
-            'content' => tiptap_converter()->asJSON($content)
-        ]);
+        return [
+            'title' => $this->faker->sentence(),
+            'html_content' => $content,
+            'json_content' => tiptap_converter()->asJSON($content, decoded: true),
+            'text_content' => tiptap_converter()->asText($content),
+        ];
     }
 }
\ No newline at end of file
diff --git a/tests/src/AdminPanelProvider.php b/tests/src/AdminPanelProvider.php
index 2b241aeb..7e2dacf8 100644
--- a/tests/src/AdminPanelProvider.php
+++ b/tests/src/AdminPanelProvider.php
@@ -2,6 +2,9 @@
 
 namespace FilamentTiptapEditor\Tests;
 
+use App\TiptapBlocks\BatmanBlock;
+use App\TiptapBlocks\StaticBlock;
+use App\TiptapBlocks\VideoBlock;
 use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
@@ -9,6 +12,7 @@
 use Filament\Panel;
 use Filament\PanelProvider;
 use FilamentTiptapEditor\Tests\Resources\PageResource;
+use FilamentTiptapEditor\TiptapEditor;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
diff --git a/tests/src/FormsTest.php b/tests/src/FormsTest.php
index d966094e..550ec87b 100644
--- a/tests/src/FormsTest.php
+++ b/tests/src/FormsTest.php
@@ -17,19 +17,7 @@
        ->assertFormFieldExists('text_content');
 });
 
-it('has proper html', function() {
-    $page = Page::factory()->make();
-
-    Livewire::test(TestComponentWithForm::class)
-        ->fillForm($page->toArray())
-        ->assertFormSet([
-            'html_content' => $page->html_content,
-            'json_content' => $page->json_content,
-            'text_content' => $page->text_content,
-        ]);
-});
-
-it('creates proper data', function() {
+it('creates record', function() {
     $page = Page::factory()->make();
 
     Livewire::test(CreatePage::class)
@@ -37,18 +25,23 @@
             'title' => $page->title,
             'html_content' => $page->html_content,
             'json_content' => $page->json_content,
+            'text_content' => $page->text_content,
         ])
         ->call('create')
         ->assertHasNoFormErrors();
 
     $this->assertDatabaseHas(Page::class, [
         'title' => $page->title,
-        'html_content' => $page->html_content,
-        'json_content' => $page->json_content,
     ]);
+
+    $storedPage = Page::query()->where('title', $page->title)->first();
+
+    expect($storedPage)
+        ->html_content->toBe($page->html_content)
+        ->json_content->toBe($page->json_content);
 });
 
-it('updates proper html', function() {
+it('updates record', function() {
     $page = Page::factory()->create();
     $newData = Page::factory()->make();
 
@@ -63,7 +56,13 @@
         ->call('save')
         ->assertHasNoFormErrors();
 
-    expect($page->refresh())
+    $this->assertDatabaseHas(Page::class, [
+        'title' => $newData->title,
+    ]);
+
+    $storedPage = Page::query()->where('id', $page->id)->first();
+
+    expect($storedPage)
         ->html_content->toBe($newData->html_content)
         ->json_content->toBe($newData->json_content);
 });
diff --git a/tests/src/Models/Page.php b/tests/src/Models/Page.php
index 4d8fe7ed..f8ba23e0 100644
--- a/tests/src/Models/Page.php
+++ b/tests/src/Models/Page.php
@@ -16,4 +16,8 @@ protected static function newFactory(): PageFactory
     }
 
     protected $guarded = [];
+
+    protected $casts = [
+        'json_content' => 'array',
+    ];
 }
diff --git a/tests/src/Resources/PageResource/Pages/CreatePage.php b/tests/src/Resources/PageResource/Pages/CreatePage.php
index 6488f713..5a763c3d 100644
--- a/tests/src/Resources/PageResource/Pages/CreatePage.php
+++ b/tests/src/Resources/PageResource/Pages/CreatePage.php
@@ -4,6 +4,7 @@
 
 use FilamentTiptapEditor\Tests\Resources\PageResource;
 use Filament\Resources\Pages\CreateRecord;
+use JetBrains\PhpStorm\NoReturn;
 
 class CreatePage extends CreateRecord
 {