diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 803418aad..163788692 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -30,7 +30,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  // await cleanDatabase()
+  await cleanDatabase()
   driver.close()
 })
 
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index b03b5e648..2cf72e9fe 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,4 +1,3 @@
-import { v4 as uuid } from 'uuid'
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
 
@@ -21,20 +20,20 @@ export default {
     CreateMessage: async (_parent, params, context, _resolveInfo) => {
       const { roomId, content } = params
       const { user: { id: currentUserId } } = context
-      const messageId = uuid()
       const session = context.driver.session()
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
           MERGE (currentUser)-[:CREATED]->(message:Message)-[:INSIDE]->(room)
-          SET message.createdAt = toString(datetime()),
-          message.id = $messageId,
-          message.content = $content
+          ON CREATE SET
+            message.createdAt = toString(datetime()),
+            message.id = apoc.create.uuid(),
+            message.content = $content
           RETURN message { .* }
         `
         const createMessageTxResponse = await transaction.run(
           createMessageCypher,
-          { currentUserId, roomId, messageId, content }
+          { currentUserId, roomId, content }
         )
         const [message] = await createMessageTxResponse.records.map((record) =>
                                                                     record.get('message'),
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 1c9333bd7..8c4d887cb 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -29,7 +29,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  // await cleanDatabase()
+  await cleanDatabase()
   driver.close()
 })
 
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 919e6a295..5b14104db 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -1,6 +1,6 @@
-input _MessageFilter {
-  room: _RoomFilter
-}
+# input _MessageFilter {
+#   room: _RoomFilter
+# }
 
 type Message {
   id: ID!