diff --git a/src/BuilderBag.php b/src/BuilderBag.php
index 439febc6aabdc4e549ab48254de4c7b1e81667a0..997667fc110c2f794876a2e20e09602c93b6b33c 100644
--- a/src/BuilderBag.php
+++ b/src/BuilderBag.php
@@ -43,7 +43,7 @@ class BuilderBag
         if (method_exists($builder, 'getName')) {
             $name = $builder->getName();
         } else {
-            $name = uniqid();
+            $name = bin2hex(random_bytes(30));
         }
 
         $this->bag[$name] = $builder;
diff --git a/src/SearchEndpoint/AbstractSearchEndpoint.php b/src/SearchEndpoint/AbstractSearchEndpoint.php
index ff008e59ddf5567c67fdb028a2194b7fdf4417d3..d3e851dcb4847b747daad3005bdec55e51164cb1 100644
--- a/src/SearchEndpoint/AbstractSearchEndpoint.php
+++ b/src/SearchEndpoint/AbstractSearchEndpoint.php
@@ -37,7 +37,7 @@ abstract class AbstractSearchEndpoint extends AbstractNormalizable implements Se
         }
 
         if (!$key) {
-            $key = uniqid();
+            $key = bin2hex(random_bytes(30));
         }
 
         $this->container[$key] = $builder;