diff --git a/internal/handler/message.go b/internal/handler/message.go
index 36e5b29..a880309 100644
--- a/internal/handler/message.go
+++ b/internal/handler/message.go
@@ -45,32 +45,20 @@ func (m *MessageHandler) AddMessage(w http.ResponseWriter, r *http.Request) {
 	}
 	defer r.Body.Close()
 
-	newMessage := message.Message{Content: req.Content, UserId: req.UserId}
-
 	var statusCode int
 	var resp AddMessageResponse
+	newMessage := message.Message{Content: req.Content, UserId: req.UserId}
 
 	ctx := r.Context()
 
-	if exists, err := m.MessageStore.MessageExists(ctx, &newMessage); err != nil {
-		fmt.Println("Error: ", err)
+	if err := m.MessageStore.CreateMessage(ctx, &newMessage); err != nil {
+		fmt.Println("Error:", err)
 		statusCode = http.StatusInternalServerError
 		resp.Message = err.Error()
 	} else {
-		if exists {
-			statusCode = http.StatusBadRequest
-			resp.Message = "Cannot create message"
-		} else {
-			if err = m.MessageStore.CreateMessage(ctx, &newMessage); err != nil {
-				fmt.Println("Error:", err)
-				statusCode = http.StatusInternalServerError
-				resp.Message = err.Error()
-			} else {
-				statusCode = http.StatusCreated
-				resp.Message = "Message created"
-				resp.Data = append(resp.Data, newMessage)
-			}
-		}
+		statusCode = http.StatusCreated
+		resp.Message = "Message created"
+		resp.Data = append(resp.Data, newMessage)
 	}
 
 	RespondWithJSON(w, statusCode, &resp)