diff --git a/src/api/endpoints.py b/src/api/endpoints.py
index 5a613c7..9a74d7f 100644
--- a/src/api/endpoints.py
+++ b/src/api/endpoints.py
@@ -128,7 +128,11 @@ async def message_actions(payload: str = Form(...)) -> JSONResponse:
 			).get("text", None)
 
 			user_id = form_json.get("user", {}).get("id")
-			await slack.add_announcement(message_object, user_id)
+
+			username: str = await slack.get_username(user_id=user_id)
+			username = username[:40]
+
+			slack.add_announcement(message_object, username)
 
 			if response_url:
 				async with httpx.AsyncClient() as client:
diff --git a/src/core/slack.py b/src/core/slack.py
index c2a7c23..56d2e55 100644
--- a/src/core/slack.py
+++ b/src/core/slack.py
@@ -164,7 +164,7 @@ def get_announcement() -> dict[str, str] | None:
 	return announcements.pop(0)
 
 
-async def add_announcement(announcement_text: str, user_id: str) -> None:
+def add_announcement(announcement_text: str, username: str) -> None:
 	"""
 	Adds an announcement to the queue.
 
@@ -177,8 +177,6 @@ async def add_announcement(announcement_text: str, user_id: str) -> None:
 		logger.warning("Attempted to add empty announcement, skipping!")
 		return
 
-	username: str = await get_username(user_id=user_id)
-
 	new_addition: dict[str, str] = {"content": announcement_text, "user": username}
 
 	announcements.append(new_addition)
diff --git a/tests/src/core/test_slack.py b/tests/src/core/test_slack.py
index e6c0361..b1a143e 100644
--- a/tests/src/core/test_slack.py
+++ b/tests/src/core/test_slack.py
@@ -140,18 +140,18 @@ def test_get_and_add_announcement(monkeypatch):
 
 	skip_announcements: list[str | None] = [None, "", "   "]
 	for ann in skip_announcements:
-		slack.add_announcement(ann)
+		slack.add_announcement(ann, "FAKE ID")
 
 	assert slack.get_announcement() is None
 
 	test_announcements: list[str] = ["First", "Second", "Third"]
 
 	for ann in test_announcements:
-		slack.add_announcement(ann)
+		slack.add_announcement(ann, "FAKE ID")
 
 	for ann in test_announcements:
-		assert slack.get_announcement() == ann
+		assert slack.get_announcement().get("content", "") == ann
 
 	assert (
-		slack.get_announcement() == test_announcements[-1]
+		slack.get_announcement().get("content", "") == test_announcements[-1]
 	)  # should return last announcement when queue is empty