diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index bac43229c..c495db61b 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -3381,7 +3381,7 @@ class AdminOrdersControllerCore extends AdminController
 
         if (!count($this->errors)) {
             $objBookingDetail = new HotelBookingDetail();
-            if ($roomBookingInfo = $objBookingDetail->getRoomBookingData($idRoom, $idOrder)) {
+            if ($roomBookingInfo = $objBookingDetail->getRoomBookingData($idRoom, $idOrder, $dateFrom, $dateTo)) {
                 //  if admin choose Check-Out status
                 if ($newStatus == 3
                     && $roomBookingInfo['check_in'] ==  '0000-00-00 00:00:00'
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index 5fac0e8d7..650362875 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -1753,11 +1753,12 @@ class HotelBookingDetail extends ObjectModel
         );
     }
 
-    public function getRoomBookingData($idRoom, $idOrder)
+    public function getRoomBookingData($idRoom, $idOrder, $date_from, $date_to)
     {
         $sql = 'SELECT `id_product`, `id_order_detail`, `id_hotel`, `id_customer`, `booking_type`, `id_status`, `check_in`, `check_out`
                 FROM `'._DB_PREFIX_.'htl_booking_detail`
-                WHERE `id_order`='.(int)$idOrder.' AND `id_room`='.(int)$idRoom;
+                WHERE `id_order`='.(int)$idOrder.' AND `id_room`='.(int)$idRoom.'
+                AND `date_from`=\''.pSQL($date_from).'\' AND `date_to`= \''.pSQL($date_to).'\'';
 
         return Db::getInstance()->getRow($sql);
     }