Fix to prevent queries not completing #986

Job	Run time
build_and_test (tls, linux, amd64)	1m 47s
build_and_test (tls, linux, arm64)	1m 41s
build_and_test (tls, darwin, amd64)	1m 35s
build_and_test (tls, darwin, arm64)	1m 36s
build_and_test (tls, windows, amd64)	4s
build_and_test (tls, windows, arm64)	4s
build_and_test (admin, linux, amd64)	1m 34s
build_and_test (admin, linux, arm64)	1m 32s
build_and_test (admin, darwin, amd64)	1m 33s
build_and_test (admin, darwin, arm64)	1m 37s
build_and_test (admin, windows, amd64)	3s
build_and_test (admin, windows, arm64)	7s
build_and_test (api, linux, amd64)	1m 32s
build_and_test (api, linux, arm64)	1m 30s
build_and_test (api, darwin, amd64)	1m 31s
build_and_test (api, darwin, arm64)	1m 31s
build_and_test (api, windows, amd64)	4s
build_and_test (api, windows, arm64)	4s
build_and_test (cli, linux, amd64)	45s
build_and_test (cli, linux, arm64)	44s
build_and_test (cli, darwin, amd64)	44s
build_and_test (cli, darwin, arm64)	44s
build_and_test (cli, windows, amd64)	44s
build_and_test (cli, windows, arm64)	50s
	23m 56s

Provide feedback