diff --git a/frontend/src/components/Tickets/index.js b/frontend/src/components/Tickets/index.js
index 3176782..05d2159 100644
--- a/frontend/src/components/Tickets/index.js
+++ b/frontend/src/components/Tickets/index.js
@@ -248,8 +248,7 @@ const Tickets = () => {
 	}, [ticketId, userId, history]);
 
 	const loadMore = () => {
-		if (loading) return;
-		setPageNumber(prevPageNumber => prevPageNumber + 1);
+		setPageNumber(prevState => prevState + 1);
 	};
 
 	const updateTickets = ({ ticket }) => {
@@ -362,8 +361,8 @@ const Tickets = () => {
 		return (
 			<InfiniteScroll
 				pageStart={0}
-				loadMore={loadMore}
-				hasMore={!(tickets.length === count)}
+				loadMore={() => !loading && loadMore()}
+				hasMore={count > tickets.length}
 				useWindow={false}
 				initialLoad={false}
 				threshold={100}
diff --git a/frontend/src/components/TicketsList/index.js b/frontend/src/components/TicketsList/index.js
index 94e3b5d..fae0bcb 100644
--- a/frontend/src/components/TicketsList/index.js
+++ b/frontend/src/components/TicketsList/index.js
@@ -149,7 +149,7 @@ const TicketsList = ({
 											{isSameDay(parseISO(ticket.updatedAt), new Date()) ? (
 												<>{format(parseISO(ticket.updatedAt), "HH:mm")}</>
 											) : (
-												<>{format(parseISO(ticket.updatedAt), "MM/dd/yyyy")}</>
+												<>{format(parseISO(ticket.updatedAt), "dd/MM/yyyy")}</>
 											)}
 										</Typography>
 									)}