diff --git a/changelog.d/5-internal/intra-listing b/changelog.d/5-internal/intra-listing
new file mode 100644
index 0000000000..b5e726d22a
--- /dev/null
+++ b/changelog.d/5-internal/intra-listing
@@ -0,0 +1 @@
+Default intraListing to true. This means that the list of clients, so far saved in both brig's and galley's databases, will still be written to both, but only read from brig's database. This avoids cases where these two tables go out of sync. Brig becomes the source of truth for clients. In the future, if this holds, code and data for galley's clients table can be removed.
diff --git a/charts/galley/templates/configmap.yaml b/charts/galley/templates/configmap.yaml
index c5ce757ace..e5a4f7864a 100644
--- a/charts/galley/templates/configmap.yaml
+++ b/charts/galley/templates/configmap.yaml
@@ -48,7 +48,7 @@ data:
 
     settings:
       httpPoolSize: {{ .settings.httpPoolSize }}
-      intraListing: false
+      intraListing: {{ .settings.intraListing }}
       maxTeamSize: {{ .settings.maxTeamSize }}
       maxConvSize: {{ .settings.maxConvSize }}
       {{- if .settings.maxFanoutSize }}
diff --git a/charts/galley/values.yaml b/charts/galley/values.yaml
index a044931d76..15276dc945 100644
--- a/charts/galley/values.yaml
+++ b/charts/galley/values.yaml
@@ -28,6 +28,7 @@ config:
     maxTeamSize: 10000
     exposeInvitationURLsTeamAllowlist: []
     maxConvSize: 500
+    intraListing: true
     # Before making indexedBillingTeamMember true while upgrading, please
     # refer to notes here: https://github.com/wireapp/wire-server-deploy/releases/tag/v2020-05-15
     indexedBillingTeamMember: false