diff --git a/packages/forms/resources/views/components/builder.blade.php b/packages/forms/resources/views/components/builder.blade.php
index 23770f2df2..a8553e29d6 100644
--- a/packages/forms/resources/views/components/builder.blade.php
+++ b/packages/forms/resources/views/components/builder.blade.php
@@ -120,7 +120,7 @@
                         x-on:expand="isCollapsed = false"
                         x-sortable-item="{{ $itemKey }}"
                         {{
-                            $item->getParentComponent()->getExtraAttributes()
+                            $item->getParentComponent()->getExtraAttributeBag()
                                 ->class(['fi-fo-builder-item'])
                         }}
                         x-bind:class="{ 'fi-collapsed': isCollapsed }"
diff --git a/tests/src/Forms/Components/BuilderTest.php b/tests/src/Forms/Components/BuilderTest.php
new file mode 100644
index 0000000000..fca1aa26d1
--- /dev/null
+++ b/tests/src/Forms/Components/BuilderTest.php
@@ -0,0 +1,47 @@
+<?php
+
+use Filament\Forms\Components\Builder;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Schema;
+use Filament\Tests\Fixtures\Livewire\Livewire;
+use Filament\Tests\TestCase;
+
+use function Filament\Tests\livewire;
+
+uses(TestCase::class);
+
+it('displays blocks in builder', function (): void {
+    $data = [
+        'builder' => [
+            [
+                'type' => 'one',
+                'data' => [
+                    'foo' => 'test',
+                ],
+            ],
+        ],
+    ];
+
+    livewire(TestComponentWithBuilder::class)
+        ->assertSuccessful()
+        ->fillForm($data)
+        ->assertSchemaStateSet($data);
+});
+
+class TestComponentWithBuilder extends Livewire
+{
+    public function form(Schema $form): Schema
+    {
+        return $form
+            ->components([
+                Builder::make('builder')
+                    ->blocks([
+                        Builder\Block::make('one')
+                            ->schema([
+                                TextInput::make('foo'),
+                            ]),
+                    ]),
+            ])
+            ->statePath('data');
+    }
+}