diff --git a/src/test/java/org/tkit/onecx/product/store/bff/rs/MicrofrontendsRestControllerTest.java b/src/test/java/org/tkit/onecx/product/store/bff/rs/MicrofrontendsRestControllerTest.java
index 707ebf2..f0297f0 100644
--- a/src/test/java/org/tkit/onecx/product/store/bff/rs/MicrofrontendsRestControllerTest.java
+++ b/src/test/java/org/tkit/onecx/product/store/bff/rs/MicrofrontendsRestControllerTest.java
@@ -541,7 +541,8 @@ void searchMicrofrontends_shouldReturnEmptyList_whenSearchCriteriaDoesNotMatch()
         Assertions.assertEquals(data.getTotalElements(), response.getTotalElements());
         Assertions.assertEquals(data.getTotalPages(), response.getTotalPages());
         Assertions.assertEquals(data.getNumber(), response.getNumber());
-        Assertions.assertNull(response.getStream());
+        Assertions.assertNotNull(response.getStream());
+        Assertions.assertEquals(0, response.getStream().size());
     }
 
     /**
diff --git a/src/test/java/org/tkit/onecx/product/store/bff/rs/ProductsRestControllerTest.java b/src/test/java/org/tkit/onecx/product/store/bff/rs/ProductsRestControllerTest.java
index 09311bc..b206643 100644
--- a/src/test/java/org/tkit/onecx/product/store/bff/rs/ProductsRestControllerTest.java
+++ b/src/test/java/org/tkit/onecx/product/store/bff/rs/ProductsRestControllerTest.java
@@ -541,7 +541,8 @@ void searchProducts_shouldReturnEmptyList_whenSearchCriteriaDoesNotMatch() {
         Assertions.assertEquals(data.getTotalElements(), response.getTotalElements());
         Assertions.assertEquals(data.getTotalPages(), response.getTotalPages());
         Assertions.assertEquals(data.getNumber(), response.getNumber());
-        Assertions.assertNull(response.getStream());
+        Assertions.assertNotNull(response.getStream());
+        Assertions.assertEquals(0, response.getStream().size());
     }
 
     /**