diff --git a/changelog/unreleased/fix-default-client-registry-settings.md b/changelog/unreleased/fix-default-client-registry-settings.md
new file mode 100644
index 00000000000..8c6d7cd66ad
--- /dev/null
+++ b/changelog/unreleased/fix-default-client-registry-settings.md
@@ -0,0 +1,6 @@
+Bugfix: Make the default grpc client use the registry settings
+
+We've fixed the default grpc client to use the registry settings. Previously it always
+used mdns.
+
+https://github.com/owncloud/ocis/pull/3041
diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go
index c21609b53b3..114101353f2 100644
--- a/ocis-pkg/service/grpc/service.go
+++ b/ocis-pkg/service/grpc/service.go
@@ -18,7 +18,11 @@ import (
 var DefaultClient = getDefaultGrpcClient()
 
 func getDefaultGrpcClient() client.Client {
+
+	reg := registry.GetRegistry()
+
 	return mgrpcc.NewClient(
+		client.Registry(reg),
 		client.Wrap(mbreaker.NewClientWrapper()),
 	)
 }