diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 03b7bc4c6a..17da2ed395 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -305,8 +305,6 @@ static void
 gtk_application_add_platform_data (GApplication    *application,
                                    GVariantBuilder *builder)
 {
-  GdkDisplay *display;
-
   /* This is slightly evil.
    *
    * We don't have an impl here because we're remote so we can't figure
@@ -314,21 +312,14 @@ gtk_application_add_platform_data (GApplication    *application,
    *
    * So we do all the things... which currently is just one thing.
    */
-  display = gdk_display_get_default ();
-  if (display)
-    {
-      const char *startup_id;
+  const char *startup_id = gdk_get_startup_notification_id ();
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      startup_id = gdk_display_get_startup_notification_id (display);
-G_GNUC_END_IGNORE_DEPRECATIONS
-      if (startup_id && g_utf8_validate (startup_id, -1, NULL))
-        {
-          g_variant_builder_add (builder, "{sv}", "activation-token",
-                                 g_variant_new_string (startup_id));
-          g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
-                                 g_variant_new_string (startup_id));
-        }
+  if (startup_id && g_utf8_validate (startup_id, -1, NULL))
+    {
+      g_variant_builder_add (builder, "{sv}", "activation-token",
+                             g_variant_new_string (startup_id));
+      g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
+                             g_variant_new_string (startup_id));
     }
 }