diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 87ffaaf1..98855527 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -21,8 +21,7 @@
         "--talk-name=org.gnome.Contacts",
         "--talk-name=org.gnome.ControlCenter",
         "--talk-name=org.gnome.OnlineAccounts",
-        "--talk-name=org.gnome.evolution.dataserver.AddressBook9",
-        "--talk-name=org.gnome.evolution.dataserver.Sources5",
+        "--talk-name=org.gnome.evolution.dataserver.*",
         "--filesystem=xdg-cache/evolution/addressbook:ro",
         "--metadata=X-DConf=migrate-path=/org/gnome/Geary/",
         "--filesystem=~/.config/geary:ro",
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index 6c48b0b2..0421de7a 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -50,8 +50,7 @@ finish-args:
   - "--talk-name=org.gnome.OnlineAccounts"
 
   # Folks contact and avatar support (via EDS)
-  - "--talk-name=org.gnome.evolution.dataserver.AddressBook9"
-  - "--talk-name=org.gnome.evolution.dataserver.Sources5"
+  - "--talk-name=org.gnome.evolution.dataserver.*"
   - "--filesystem=xdg-cache/evolution/addressbook:ro"
 
   # Migrate GSettings into the sandbox