diff --git a/cogs/post_highscores/__init__.py b/cogs/post_highscores/__init__.py
index 229a9e1..c26e885 100644
--- a/cogs/post_highscores/__init__.py
+++ b/cogs/post_highscores/__init__.py
@@ -31,7 +31,7 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
         """
         highscore_channel_id = highscores_data["highscore_channel_id"]
         print(f"Printing out highscores information in channel {highscore_channel_id}")
-        channel = self.bot.get_channel(highscore_channel_id)
+        channel = ctx.guild.get_channel(highscore_channel_id)
 
         error_response = 'Registered Highscores channel does not exist or was never registered. \n\
                 Register with "?register" command.'
diff --git a/utilities/data_storage.py b/utilities/data_storage.py
index 3b07f1a..ad9bb40 100644
--- a/utilities/data_storage.py
+++ b/utilities/data_storage.py
@@ -37,8 +37,10 @@ def create_message_map(data: dict):
 
     message_map = {}
 
-    for boss, info in data["tables"].items():
-        message_map[info["message_id"]] = boss
+    for guild, guild_scores in data.items():
+
+        for boss, info in guild_scores["tables"].items():
+            message_map[guild][info["message_id"]] = boss
 
     return message_map
 
diff --git a/utilities/utils.py b/utilities/utils.py
index 6f58685..d452f51 100644
--- a/utilities/utils.py
+++ b/utilities/utils.py
@@ -49,7 +49,7 @@ def format_highscore_message(boss_name: str):
     return ret_string + "```"
 
 
-async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
+async def send_highscore_message(channel: nextcord.TextChannel, boss_name: str) -> nextcord.Message:
     """
     Function takes care of checking if a message exists for a boss, then
     creating and sending/editing the message
@@ -68,7 +68,9 @@ async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
         message_id = message.id
         highscores_data["tables"][boss_name]["message_id"] = message_id
         # save message -> boss_name in message_map
-        highscores_message_map[str(message_id)] = boss_name
+        # get guild id from channel
+        # channel should come from the guild that is requesting this highscores message anyways.
+        highscores_message_map[channel.guild.id][str(message_id)] = boss_name
 
     return message
 
@@ -143,8 +145,8 @@ async def submit_score(
     print(f"Editting message {highscore_channel_id}")
     channel = interaction.guild.get_channel(highscore_channel_id)
 
-    error_response = 'Registered Highscores channel does not exist or was never registered. \
-            Register with "?register" command.'
+    error_response = "Registered Highscores channel does not exist or was never registered."
+    error_response += 'Register with "?register" command.'
     assert channel is not None, await interaction.send(error_response, ephemeral=True)
 
     await send_highscore_message(channel, boss_name)