diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index c9e8aa0362..6ab9162574 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -387,12 +387,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					if (strlen($max_members) > 0) {
 						$sql .= "max_members = '$max_members', ";
 					}
-					if (strlen($start_datetime) > 0) {
-						$sql .= "start_datetime = '".$start_datetime."', ";
-					}
-					if (strlen($stop_datetime) > 0) {
-						$sql .= "stop_datetime = '".$stop_datetime."', ";
-					}
+					$sql .= "start_datetime = '".$start_datetime."', ";
+					$sql .= "stop_datetime = '".$stop_datetime."', ";
 					if (strlen($wait_mod) > 0) {
 						$sql .= "wait_mod = '$wait_mod', ";
 					}
@@ -872,15 +868,17 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
+	echo "			<br>";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
-		echo "				<input type='hidden' name='meeting_uuid' value='$meeting_uuid'>\n";
-		echo "				<input type='hidden' name='conference_room_uuid' value='$conference_room_uuid'>\n";
+		echo "		<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
+		echo "		<input type='hidden' name='meeting_uuid' value='$meeting_uuid'>\n";
+		echo "		<input type='hidden' name='conference_room_uuid' value='$conference_room_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br>";
 
 	echo "</form>";
 
diff --git a/resources/install/scripts/app/conference_center/index.lua b/resources/install/scripts/app/conference_center/index.lua
index baae2d983b..8ff0620089 100644
--- a/resources/install/scripts/app/conference_center/index.lua
+++ b/resources/install/scripts/app/conference_center/index.lua
@@ -444,7 +444,16 @@
 						AND r.meeting_uuid = m.meeting_uuid
 						AND m.domain_uuid = ']] .. domain_uuid ..[['
 						AND (m.moderator_pin = ']] .. pin_number ..[[' or m.participant_pin = ']] .. pin_number ..[[') 
-						AND r.enabled = 'true' ]];
+						AND r.enabled = 'true'
+						AND r.enabled = 'true'
+						AND (
+								( r.start_datetime <> '' AND r.start_datetime is not null AND r.start_datetime <= ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR 
+								( r.start_datetime = '' OR r.start_datetime is null ) 
+							)
+						AND (
+								( r.stop_datetime <> '' AND r.stop_datetime is not null AND r.stop_datetime > ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR 
+								( r.stop_datetime = '' OR r.stop_datetime is null ) 
+							) ]];
 					if (debug["sql"]) then
 						freeswitch.consoleLog("notice", "[conference center] SQL: " .. sql .. "\n");
 					end