diff --git a/src/app/components/Room/Card.tsx b/src/app/components/Room/Card.tsx
index 57ed1b7..69866de 100644
--- a/src/app/components/Room/Card.tsx
+++ b/src/app/components/Room/Card.tsx
@@ -70,7 +70,11 @@ export const RoomCard = ({ id, name, date, Times, Presentator }: Room) => {
 			{moment(date).dayOfYear() === moment().dayOfYear() && (
 				<div className="flex p-2">
 					<Button
-						className={""}
+						isDisabled={
+							moment(moment(Times[0].startTime).subtract(5, "minutes")).isAfter(
+								moment(),
+							)
+						}
 						color="primary"
 						radius="full"
 						size="sm"
diff --git a/src/app/components/Room/Table.tsx b/src/app/components/Room/Table.tsx
index a449e64..e24db89 100644
--- a/src/app/components/Room/Table.tsx
+++ b/src/app/components/Room/Table.tsx
@@ -36,7 +36,7 @@ export const RoomTable = () => {
 								moment(room.date).isSame(moment(), "day"),
 							);
 							const past = classes.data.filter((room) =>
-								moment(room.date).isBefore(moment()),
+								moment(room.date).isBefore(moment(), "day"),
 							);
 							setRooms({ future, actual, past });
 						});