diff --git a/client/components/AutoCompleteDepartment.js b/client/components/AutoCompleteDepartment.js
index acc8781d41a30..a7e8041cd69e4 100644
--- a/client/components/AutoCompleteDepartment.js
+++ b/client/components/AutoCompleteDepartment.js
@@ -11,7 +11,7 @@ export const AutoCompleteDepartment = React.memo((props) => {
 
 	const { label } = props;
 
-	const options = useMemo(() => (data && [{ value: 'All', label: label && t('All') }, ...data.departments.map((department) => ({ value: department._id, label: department.name }))]) || [{ value: 'All', label: label || t('All') }], [data, label, t]);
+	const options = useMemo(() => (data && [{ value: 'all', label: label && t('All') }, ...data.departments.map((department) => ({ value: department._id, label: department.name }))]) || [{ value: 'all', label: label || t('All') }], [data, label, t]);
 
 	return <AutoComplete
 		{...props}
diff --git a/client/views/omnichannel/currentChats/CurrentChatsRoute.js b/client/views/omnichannel/currentChats/CurrentChatsRoute.js
index 72c1126413726..d8612fe1f4968 100644
--- a/client/views/omnichannel/currentChats/CurrentChatsRoute.js
+++ b/client/views/omnichannel/currentChats/CurrentChatsRoute.js
@@ -68,8 +68,11 @@ const useQuery = ({ guest, servedBy, department, status, from, to, tags, customF
 		...current && { offset: current },
 	};
 
-	if (from && to) {
-		query.createdAt = JSON.stringify({ start: from, end: to });
+	if (from || to) {
+		query.createdAt = JSON.stringify({
+			...from && { start: moment(new Date(from)).set({ hour: '00', minutes: '00', seconds: '00' }).format('YYYY-MM-DDTHH:mm:ss') },
+			...to && { end: moment(new Date(to)).set({ hour: '23', minutes: '59', seconds: '59' }).format('YYYY-MM-DDTHH:mm:ss') },
+		});
 	}
 	if (status !== 'all') {
 		query.open = status === 'opened';