diff --git a/phpstan.neon b/phpstan.neon
index 8eacab5..1a74fff 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -47,7 +47,7 @@ parameters:
             path: src/RenderableComment.php
 
         -
-            message: '#^Call to an undefined method PHPUnit\\Framework\\TestCase::[a-zA-Z0-9_]+\(\)\.$#'
+            message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall::[a-zA-Z0-9_]+\(\)\.$#'
             identifier: method.notFound
             count: 3
             path: tests/**/*.php
@@ -58,13 +58,13 @@ parameters:
             path: tests/Pest.php
 
         -
-            message: '#^Call to an undefined method PHPUnit\\Framework\\TestCase\:\:assertDatabaseHas\(\)\.$#'
+            message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:assertDatabaseHas\(\)\.$#'
             identifier: method.notFound
             count: 2
             path: tests/Livewire/CommentReactionTest.php
 
         -
-            message: '#^Call to an undefined method PHPUnit\\Framework\\TestCase\:\:assertDatabaseMissing\(\)\.$#'
+            message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:assertDatabaseMissing\(\)\.$#'
             identifier: method.notFound
             count: 3
             path: tests/Livewire/CommentReactionTest.php
diff --git a/resources/lang/ar/comments.php b/resources/lang/ar/comments.php
index ddf3e4e..90074ec 100644
--- a/resources/lang/ar/comments.php
+++ b/resources/lang/ar/comments.php
@@ -3,6 +3,7 @@
 return [
     'label' => 'التعليقات',
     'placeholder' => 'اكتب تعليقك…',
+    'add_comment' => 'أضف تعليقًا',
     'no_comments_yet' => 'لا توجد تعليقات .',
 
     'user_avatar_alt' => 'صورة المستخدم ',
diff --git a/resources/lang/en/comments.php b/resources/lang/en/comments.php
index 77dc525..87f740d 100644
--- a/resources/lang/en/comments.php
+++ b/resources/lang/en/comments.php
@@ -3,6 +3,7 @@
 return [
     'label' => 'Comments',
     'placeholder' => 'Type your comment…',
+    'add_comment' => 'Add a comment',
     'no_comments_yet' => 'No comments yet.',
 
     'user_avatar_alt' => 'User Avatar',
diff --git a/resources/lang/es/comments.php b/resources/lang/es/comments.php
index 99d02de..130fa0d 100644
--- a/resources/lang/es/comments.php
+++ b/resources/lang/es/comments.php
@@ -3,6 +3,7 @@
 return [
     'label' => 'Comentarios',
     'placeholder' => 'Escribe tu comentario...',
+    'add_comment' => 'Añadir un comentario',
     'no_comments_yet' => 'Aún no hay comentarios.',
 
     'user_avatar_alt' => 'Avatar de usuario',
diff --git a/resources/lang/fr/comments.php b/resources/lang/fr/comments.php
index ea38080..3dfe0c5 100644
--- a/resources/lang/fr/comments.php
+++ b/resources/lang/fr/comments.php
@@ -3,6 +3,7 @@
 return [
     'label' => 'Commentaires',
     'placeholder' => 'Rédiger votre commentaire...',
+    'add_comment' => 'Ajouter un commentaire',
     'no_comments_yet' => 'Aucun commentaire pour le moment.',
 
     'user_avatar_alt' => 'Avatar de l\'utilisateur',
diff --git a/resources/lang/nl/comments.php b/resources/lang/nl/comments.php
index 187446a..a647188 100644
--- a/resources/lang/nl/comments.php
+++ b/resources/lang/nl/comments.php
@@ -2,6 +2,7 @@
 
 return [
     'label' => 'Opmerkingen',
+    'add_comment' => 'Een opmerking toevoegen',
     'no_comments_yet' => 'Nog geen opmerkingen.',
 
     'user_avatar_alt' => 'Profielfoto',
diff --git a/resources/lang/ro/comments.php b/resources/lang/ro/comments.php
index a3c0ff4..1a9de19 100644
--- a/resources/lang/ro/comments.php
+++ b/resources/lang/ro/comments.php
@@ -3,6 +3,7 @@
 return [
     'label' => 'Comentarii',
     'placeholder' => 'Scrie comentariul tău...',
+    'add_comment' => 'Adaugă un comentariu',
     'no_comments_yet' => 'Niciun comentariu încă.',
 
     'user_avatar_alt' => 'Avatar',
diff --git a/resources/views/comments.blade.php b/resources/views/comments.blade.php
index d151a6f..1be459b 100644
--- a/resources/views/comments.blade.php
+++ b/resources/views/comments.blade.php
@@ -4,7 +4,7 @@
     {{-- Main Comments Area --}}
     <div class="comm:flex-1 comm:space-y-2">
         @if (Config::resolveAuthenticatedUser()?->can('create', Config::getCommentModel()))
-            <form wire:submit.prevent="save" x-cloak>
+            <div x-cloak role="form" aria-label="{{ __('commentions::comments.add_comment') }}">
                 {{-- tiptap editor --}}
                 <div class="comm:relative tip-tap-container comm:mb-2" x-on:click="wasFocused = true" wire:ignore>
                     <div
@@ -29,7 +29,7 @@
                     >{{ __('commentions::comments.cancel') }}</x-filament::button>
                 </div>
             </template>
-        </form>
+        </div>
     @endif
 
         <livewire:dynamic-component
diff --git a/tests/Livewire/CommentsTest.php b/tests/Livewire/CommentsTest.php
index 6735dbd..e685692 100644
--- a/tests/Livewire/CommentsTest.php
+++ b/tests/Livewire/CommentsTest.php
@@ -83,6 +83,21 @@
     Event::assertNotDispatched(CommentWasCreatedEvent::class);
 });
 
+test('comments composer does not render a form element', function () {
+    /** @var User $user */
+    $user = User::factory()->create();
+    actingAs($user);
+
+    $post = Post::factory()->create();
+
+    livewire(Comments::class, [
+        'record' => $post,
+    ])
+        ->assertDontSeeHtml('<form')
+        ->assertSeeHtml('role="form"')
+        ->assertSeeHtml('wire:click="save"');
+});
+
 test('comments editor includes prefixed component alias', function () {
     /** @var User $user */
     $user = User::factory()->create();