diff --git a/src/sentry/integrations/slack/unfurl/discover.py b/src/sentry/integrations/slack/unfurl/discover.py
index 80d42642a61dad..b4db950cc3e7b7 100644
--- a/src/sentry/integrations/slack/unfurl/discover.py
+++ b/src/sentry/integrations/slack/unfurl/discover.py
@@ -152,7 +152,9 @@ def unfurl_discover(
         # Only override if key doesn't exist since we want to account for
         # an intermediate state where the query could have been cleared
         if "query" not in params:
-            params.setlist("query", params.getlist("query") or to_list(saved_query.get("query")))
+            params.setlist(
+                "query", params.getlist("query") or to_list(saved_query.get("query", ""))
+            )
 
         display_mode = str(params.get("display") or saved_query.get("display", "default"))
 
@@ -187,6 +189,8 @@ def unfurl_discover(
         endpoint = "events-stats/"
         if "worldmap" in display_mode:
             endpoint = "events-geo/"
+            params.setlist("field", params.getlist("yAxis"))
+            params.pop("sort", None)
 
         try:
             resp = client.get(
diff --git a/tests/sentry/integrations/slack/test_unfurl.py b/tests/sentry/integrations/slack/test_unfurl.py
index a5a84365d574fc..b7d71703b8c881 100644
--- a/tests/sentry/integrations/slack/test_unfurl.py
+++ b/tests/sentry/integrations/slack/test_unfurl.py
@@ -515,7 +515,7 @@ def test_unfurl_world_map(self, mock_generate_chart):
             project_id=self.project.id,
         )
 
-        url = f"https://sentry.io/organizations/{self.organization.slug}/discover/results/?display=worldmap&field=count()&name=All+Events&project={self.project.id}&query=&statsPeriod=24h"
+        url = f"https://sentry.io/organizations/{self.organization.slug}/discover/results/?display=worldmap&field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All+Events&project={self.project.id}&query=&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29"
         link_type, args = match_link(url)
 
         if not args or not link_type: