diff --git a/src/app/endpoints/conversations_v2.py b/src/app/endpoints/conversations_v2.py
index 6b8bcb8e..caf5b590 100644
--- a/src/app/endpoints/conversations_v2.py
+++ b/src/app/endpoints/conversations_v2.py
@@ -243,8 +243,6 @@ def transform_chat_message(entry: CacheEntry) -> dict[str, Any]:
     return {
         "provider": entry.provider,
         "model": entry.model,
-        "query": entry.query,
-        "response": entry.response,
         "messages": [
             {"content": entry.query, "type": "user"},
             {"content": entry.response, "type": "assistant"},
diff --git a/tests/unit/app/endpoints/test_conversations_v2.py b/tests/unit/app/endpoints/test_conversations_v2.py
new file mode 100644
index 00000000..d24cabd0
--- /dev/null
+++ b/tests/unit/app/endpoints/test_conversations_v2.py
@@ -0,0 +1,33 @@
+# pylint: disable=redefined-outer-name
+
+"""Unit tests for the /conversations REST API endpoints."""
+
+from app.endpoints.conversations_v2 import transform_chat_message
+
+from models.cache_entry import CacheEntry
+
+
+def test_transform_message() -> None:
+    """Test the transform_chat_message transformation function."""
+    entry = CacheEntry(
+        query="query", response="response", provider="provider", model="model"
+    )
+    transformed = transform_chat_message(entry)
+    assert transformed is not None
+
+    assert "provider" in transformed
+    assert transformed["provider"] == "provider"
+
+    assert "model" in transformed
+    assert transformed["model"] == "model"
+
+    assert "messages" in transformed
+    assert len(transformed["messages"]) == 2
+
+    message1 = transformed["messages"][0]
+    assert message1["type"] == "user"
+    assert message1["content"] == "query"
+
+    message2 = transformed["messages"][1]
+    assert message2["type"] == "assistant"
+    assert message2["content"] == "response"