diff --git a/cmix/gateway/hostPool.go b/cmix/gateway/hostPool.go
index c37dbdf2fdcda4b8f9f8fac7f9339640809e40fe..0bf9d5a929a4d02a48a15e7a2f45d8306c8cbcd1 100644
--- a/cmix/gateway/hostPool.go
+++ b/cmix/gateway/hostPool.go
@@ -14,7 +14,6 @@ package gateway
 
 import (
 	"encoding/json"
-	"math"
 	"sort"
 	"strings"
 	"sync"
@@ -823,7 +822,10 @@ func getPoolSize(ndfLen, maxSize uint32) (uint32, error) {
 			"Unable to create HostPool: no gateways available")
 	}
 
-	poolSize := uint32(math.Ceil(math.Sqrt(float64(ndfLen))))
+	// fix-me: this is a HACK to get it working in testnet night of 10/12/2022
+	// DO NOT PUSH TO LIVE - gateway gossip shuffle must be fixed
+	//poolSize := uint32(math.Ceil(math.Sqrt(float64(ndfLen))))
+	poolSize := ndfLen
 	if poolSize > maxSize {
 		return maxSize, nil
 	}