diff --git a/connections/c/nc.cc b/connections/c/nc.cc
index 26f36107..98315d08 100644
--- a/connections/c/nc.cc
+++ b/connections/c/nc.cc
@@ -262,6 +262,10 @@ NC_INSTANCE NcCreateService() {
       ::nearby::connections::config_package_nearby::nearby_connections_feature::
           kUseStableEndpointId,
       true);
+  nearby::NearbyFlags::GetInstance().OverrideBoolFlagValue(
+      ::nearby::connections::config_package_nearby::nearby_connections_feature::
+          kEnableGattQueryInThread,
+      true);
 #endif
 
   nc_context.router = new ::nearby::connections::ServiceControllerRouter();