diff --git a/src/Factory.php b/src/Factory.php
index aea1a2cc4..e22cc3a0f 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -70,6 +70,7 @@ public static function createOne(array|callable $attributes = []): mixed
      * @phpstan-param Attributes $attributes
      *
      * @return list<T>
+     * @phpstan-return ($number is positive-int ? non-empty-list<T> : list<T>)
      */
     final public static function createMany(int $number, array|callable $attributes = []): array
     {
@@ -80,6 +81,7 @@ final public static function createMany(int $number, array|callable $attributes
      * @phpstan-param Attributes $attributes
      *
      * @return list<T>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T> : list<T>)
      */
     final public static function createRange(int $min, int $max, array|callable $attributes = []): array
     {
diff --git a/src/Persistence/PersistentObjectFactory.php b/src/Persistence/PersistentObjectFactory.php
index 8a7b8d6c2..1fdaec66d 100644
--- a/src/Persistence/PersistentObjectFactory.php
+++ b/src/Persistence/PersistentObjectFactory.php
@@ -100,9 +100,9 @@ public static function randomOrCreate(array $criteria = []): object
 
     /**
      * @param positive-int $count
-     * @phpstan-param Parameters   $criteria
+     * @phpstan-param Parameters $criteria
      *
-     * @return list<T>
+     * @return non-empty-list<T>
      */
     public static function randomSet(int $count, array $criteria = []): array
     {
@@ -112,9 +112,10 @@ public static function randomSet(int $count, array $criteria = []): array
     /**
      * @param int<0, max> $min
      * @param int<0, max> $max
-     * @phpstan-param Parameters  $criteria
+     * @phpstan-param Parameters $criteria
      *
      * @return list<T>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T> : list<T>)
      */
     public static function randomRange(int $min, int $max, array $criteria = []): array
     {
@@ -124,9 +125,10 @@ public static function randomRange(int $min, int $max, array $criteria = []): ar
     /**
      * @param int<0, max> $min
      * @param int<0, max> $max
-     * @phpstan-param Parameters  $criteria
+     * @phpstan-param Parameters $criteria
      *
      * @return list<T>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T> : list<T>)
      */
     public static function randomRangeOrCreate(int $min, int $max, array $criteria = []): array
     {
diff --git a/src/Persistence/PersistentProxyObjectFactory.php b/src/Persistence/PersistentProxyObjectFactory.php
index e51d80a75..00001d023 100644
--- a/src/Persistence/PersistentProxyObjectFactory.php
+++ b/src/Persistence/PersistentProxyObjectFactory.php
@@ -89,7 +89,7 @@ final public static function randomOrCreate(array $criteria = []): object
     }
 
     /**
-     * @return list<T&Proxy<T>>
+     * @return non-empty-list<T&Proxy<T>>
      */
     final public static function randomSet(int $count, array $criteria = []): array
     {
@@ -98,6 +98,7 @@ final public static function randomSet(int $count, array $criteria = []): array
 
     /**
      * @return list<T&Proxy<T>>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T&Proxy<T>> : list<T&Proxy<T>>)
      */
     final public static function randomRange(int $min, int $max, array $criteria = []): array
     {
@@ -106,6 +107,7 @@ final public static function randomRange(int $min, int $max, array $criteria = [
 
     /**
      * @return list<T&Proxy<T>>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T&Proxy<T>> : list<T&Proxy<T>>)
      */
     public static function randomRangeOrCreate(int $min, int $max, array $criteria = []): array
     {
diff --git a/src/Persistence/RepositoryDecorator.php b/src/Persistence/RepositoryDecorator.php
index b5d2097cd..3764f5fab 100644
--- a/src/Persistence/RepositoryDecorator.php
+++ b/src/Persistence/RepositoryDecorator.php
@@ -204,9 +204,9 @@ public function random(array $criteria = []): object
 
     /**
      * @param positive-int $count
-     * @phpstan-param Parameters   $criteria
+     * @phpstan-param Parameters $criteria
      *
-     * @return list<T>
+     * @return non-empty-list<T>
      */
     public function randomSet(int $count, array $criteria = []): array
     {
@@ -220,9 +220,10 @@ public function randomSet(int $count, array $criteria = []): array
     /**
      * @param int<0, max> $min
      * @param int<0, max> $max
-     * @phpstan-param Parameters  $criteria
+     * @phpstan-param Parameters $criteria
      *
      * @return list<T>
+     * @phpstan-return ($min is positive-int ? non-empty-list<T> : list<T>)
      */
     public function randomRange(int $min, int $max, array $criteria = []): array
     {
diff --git a/stubs/phpstan/ObjectFactory.php b/stubs/phpstan/ObjectFactory.php
index 5949e9716..7113fd939 100644
--- a/stubs/phpstan/ObjectFactory.php
+++ b/stubs/phpstan/ObjectFactory.php
@@ -44,8 +44,8 @@ protected function defaults(): array
 assertType('UserForObjectFactory', UserObjectFactory::new()->with()->create());
 
 // methods returning a list of objects
-assertType("list<UserForObjectFactory>", UserObjectFactory::createMany(1));
-assertType("list<UserForObjectFactory>", UserObjectFactory::createRange(1, 2));
+assertType("non-empty-list<UserForObjectFactory>", UserObjectFactory::createMany(1));
+assertType("non-empty-list<UserForObjectFactory>", UserObjectFactory::createRange(1, 2));
 assertType("list<UserForObjectFactory>", UserObjectFactory::createSequence([]));
 
 // methods with FactoryCollection
diff --git a/stubs/phpstan/PersistentObjectFactory.php b/stubs/phpstan/PersistentObjectFactory.php
index f01610067..16d64832f 100644
--- a/stubs/phpstan/PersistentObjectFactory.php
+++ b/stubs/phpstan/PersistentObjectFactory.php
@@ -47,11 +47,11 @@ protected function defaults(): array
 
 // methods returning a list of objects
 assertType("list<UserForPersistentFactory>", UserFactory::all());
-assertType("list<UserForPersistentFactory>", UserFactory::createMany(1));
-assertType("list<UserForPersistentFactory>", UserFactory::createRange(1, 2));
+assertType("non-empty-list<UserForPersistentFactory>", UserFactory::createMany(1));
+assertType("non-empty-list<UserForPersistentFactory>", UserFactory::createRange(1, 2));
 assertType("list<UserForPersistentFactory>", UserFactory::createSequence([]));
-assertType("list<UserForPersistentFactory>", UserFactory::randomRange(1, 2));
-assertType("list<UserForPersistentFactory>", UserFactory::randomSet(2));
+assertType("non-empty-list<UserForPersistentFactory>", UserFactory::randomRange(1, 2));
+assertType("non-empty-list<UserForPersistentFactory>", UserFactory::randomSet(2));
 assertType("list<UserForPersistentFactory>", UserFactory::findBy(['name' => 'foo']));
 
 // methods with FactoryCollection
@@ -78,8 +78,8 @@ protected function defaults(): array
 assertType('UserForPersistentFactory', $repository->random());
 assertType("list<UserForPersistentFactory>", $repository->findAll());
 assertType("list<UserForPersistentFactory>", $repository->findBy([]));
-assertType("list<UserForPersistentFactory>", $repository->randomSet(2));
-assertType("list<UserForPersistentFactory>", $repository->randomRange(1, 2));
+assertType("non-empty-list<UserForPersistentFactory>", $repository->randomSet(2));
+assertType("non-empty-list<UserForPersistentFactory>", $repository->randomRange(1, 2));
 assertType('int<0, max>', $repository->count());
 
 // test autocomplete with phpstorm
diff --git a/stubs/phpstan/PersistentProxyObjectFactory.php b/stubs/phpstan/PersistentProxyObjectFactory.php
index 5b5ad5206..90ccea7f2 100644
--- a/stubs/phpstan/PersistentProxyObjectFactory.php
+++ b/stubs/phpstan/PersistentProxyObjectFactory.php
@@ -48,12 +48,12 @@ protected function defaults(): array
 
 // methods returning a list of objects
 assertType("list<{$proxyType}>", UserProxyFactory::all());
-assertType("list<{$proxyType}>", UserProxyFactory::createMany(1));
-assertType("list<{$proxyType}>", UserProxyFactory::createRange(1, 2));
+assertType("non-empty-list<{$proxyType}>", UserProxyFactory::createMany(1));
+assertType("non-empty-list<{$proxyType}>", UserProxyFactory::createRange(1, 2));
 assertType("list<{$proxyType}>", UserProxyFactory::createSequence([]));
-assertType("list<{$proxyType}>", UserProxyFactory::randomRange(1, 2));
-assertType("list<{$proxyType}>", UserProxyFactory::randomRangeOrCreate(1, 2));
-assertType("list<{$proxyType}>", UserProxyFactory::randomSet(2));
+assertType("non-empty-list<{$proxyType}>", UserProxyFactory::randomRange(1, 2));
+assertType("non-empty-list<{$proxyType}>", UserProxyFactory::randomRangeOrCreate(1, 2));
+assertType("non-empty-list<{$proxyType}>", UserProxyFactory::randomSet(2));
 assertType("list<{$proxyType}>", UserProxyFactory::findBy(['name' => 'foo']));
 
 // methods with FactoryCollection
diff --git a/stubs/psalm/ObjectFactory.php b/stubs/psalm/ObjectFactory.php
index 71de6f8eb..4a8f0d159 100644
--- a/stubs/psalm/ObjectFactory.php
+++ b/stubs/psalm/ObjectFactory.php
@@ -43,9 +43,9 @@ protected function defaults(): array|callable
 $var = UserObjectFactory::new()->with()->create();
 
 // methods returning a list of objects
-/** @psalm-check-type-exact $var = list<UserForObjectFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForObjectFactory> */
 $var = UserObjectFactory::createMany(1);
-/** @psalm-check-type-exact $var = list<UserForObjectFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForObjectFactory> */
 $var = UserObjectFactory::createRange(1, 2);
 /** @psalm-check-type-exact $var = list<UserForObjectFactory> */
 $var = UserObjectFactory::createSequence([]);
diff --git a/stubs/psalm/PersistentObjectFactory.php b/stubs/psalm/PersistentObjectFactory.php
index 5446baab7..8f1f51bd3 100644
--- a/stubs/psalm/PersistentObjectFactory.php
+++ b/stubs/psalm/PersistentObjectFactory.php
@@ -57,15 +57,15 @@ protected function defaults(): array|callable
 // methods returning a list of objects
 /** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
 $var = UserFactory::all();
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = UserFactory::createMany(1);
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = UserFactory::createRange(1, 2);
 /** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
 $var = UserFactory::createSequence([]);
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = UserFactory::randomRange(1, 2);
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = UserFactory::randomSet(2);
 /** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
 $var = UserFactory::findBy(['name' => 'foo']);
@@ -110,9 +110,9 @@ protected function defaults(): array|callable
 $var = $repository->findAll();
 /** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
 $var = $repository->findBy([]);
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = $repository->randomSet(2);
-/** @psalm-check-type-exact $var = list<UserForPersistentFactory> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForPersistentFactory> */
 $var = $repository->randomRange(1, 2);
 /** @psalm-check-type-exact $var = int */
 $var = $repository->count();
diff --git a/stubs/psalm/PersistentProxyObjectFactory.php b/stubs/psalm/PersistentProxyObjectFactory.php
index d9592add5..8e6601d91 100644
--- a/stubs/psalm/PersistentProxyObjectFactory.php
+++ b/stubs/psalm/PersistentProxyObjectFactory.php
@@ -65,7 +65,7 @@ protected function defaults(): array|callable
 $var = UserProxyFactory::createSequence([]);
 /** @psalm-check-type-exact $var = list<UserForProxyFactory&Proxy<UserForProxyFactory>> */
 $var = UserProxyFactory::randomRange(1, 2);
-/** @psalm-check-type-exact $var = list<UserForProxyFactory&Proxy<UserForProxyFactory>> */
+/** @psalm-check-type-exact $var = non-empty-list<UserForProxyFactory&Proxy<UserForProxyFactory>> */
 $var = UserProxyFactory::randomRangeOrCreate(1, 2);
 /** @psalm-check-type-exact $var = list<UserForProxyFactory&Proxy<UserForProxyFactory>> */
 $var = UserProxyFactory::randomSet(2);