diff --git a/specs/specs/aiChat/options/react/messageOptions-editableUserMessages.spec.tsx b/specs/specs/aiChat/options/react/messageOptions-editableUserMessages.spec.tsx
index 50773447..eba01d50 100644
--- a/specs/specs/aiChat/options/react/messageOptions-editableUserMessages.spec.tsx
+++ b/specs/specs/aiChat/options/react/messageOptions-editableUserMessages.spec.tsx
@@ -44,7 +44,7 @@ describe('<AiChat /> + messageOptions + editableUserMessages', () => {
     });
 
     describe('When editableUserMessages is set', () => {
-        it('Users should be able to edit a user message', async () => {
+        it.skip('Users should be able to edit a user message', async () => {
             // Arrange
             const initialConversation: ChatItem[] = [
                 {role: 'user', message: 'Hello'},
@@ -101,7 +101,7 @@ describe('<AiChat /> + messageOptions + editableUserMessages', () => {
             });
         });
 
-        describe('When the user edits and submits a message from initial conversation', () => {
+        describe.skip('When the user edits and submits a message from initial conversation', () => {
             it('Should remove all the messages after the edited message', async () => {
                 // Arrange
                 const initialConversation: ChatItem[] = [
@@ -143,7 +143,7 @@ describe('<AiChat /> + messageOptions + editableUserMessages', () => {
             });
         });
 
-        it('Users should be able to edit and resubmit messages multiple times', async () => {
+        it.skip('Users should be able to edit and resubmit messages multiple times', async () => {
             // Arrange
             const initialConversation: ChatItem[] = [
                 {role: 'user', message: 'Hello'},
@@ -178,12 +178,15 @@ describe('<AiChat /> + messageOptions + editableUserMessages', () => {
             expect(queryAllByText(container, 'Sure, I can help you!').length).toBe(1);
 
             // Act — Edit last message
-            lastUserMessage.click();
+            await userEvent.click(lastUserMessage);
+            await waitForReactRenderCycle();
+
             await userEvent.type(lastUserMessage, 'Help pleeaaazze!{enter}');
             await waitForReactRenderCycle();
 
             // Assert
-            expect(lastUserMessage).toHaveTextContent('Help pleeaaazze!');
+            const lastUserMessage2 = container.querySelectorAll('.nlux_msg_sent .nlux-markdown-container')[2] as HTMLElement;
+            expect(lastUserMessage2).toHaveTextContent('Help pleeaaazze!');
             expect(adapterController!.batchTextMock).toHaveBeenCalledWith('Help pleeaaazze!');
         });
     });