diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
index 5b242f7f..3753dfa4 100644
--- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
@@ -207,6 +207,7 @@ class ProductRepository extends AbstractRepository
             )
             ->from('tx_epproducts_domain_model_date', 'date')
             ->innerJoin('date', 'tx_epproducts_domain_model_room', 'room', 'date.uid = room.date')
+            ->orderBy('room.available', 'DESC')
         ;
 
         if (true === $sortByRoom) {
@@ -375,6 +376,8 @@ class ProductRepository extends AbstractRepository
                 'date.product',
                 $qb->createNamedParameter($product->getUid(), Connection::PARAM_INT))
             )
+            ->orderBy('room.available', 'DESC')
+            ->addOrderBy('room.name', 'ASC')
         ;
 
         return $qb