diff --git a/src/components/High/AssignmentCard.tsx b/src/components/High/AssignmentCard.tsx
index 6720c0e1..d7427e5f 100644
--- a/src/components/High/AssignmentCard.tsx
+++ b/src/components/High/AssignmentCard.tsx
@@ -73,20 +73,19 @@ export default function AssignmentCard({ user, assignment, session, startAssignm
 								className={clsx(
 									"-md:hidden h-full w-full max-w-[50%] cursor-pointer"
 								)}>
-									<Button
-										className={clsx("w-full h-full !rounded-xl")}
-										onClick={() => resumeAssignment(session)}
-										color="green"
-										variant="outline">
-											Resume
-									</Button>
+								<Button
+									className={clsx("w-full h-full !rounded-xl")}
+									onClick={() => resumeAssignment(session)}
+									color="green"
+									variant="outline">
+									Resume
+								</Button>
 							</div>
 						)}
 					</>
 				)}
 				{assignment.results.map((r) => r.user).includes(user.id) && (
 					<Button
-						onClick={() => router.push("/record")}
 						color="green"
 						className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
 						variant="outline">
diff --git a/src/pages/exam.tsx b/src/pages/exam.tsx
index e77f90c3..050c6fd0 100644
--- a/src/pages/exam.tsx
+++ b/src/pages/exam.tsx
@@ -20,6 +20,7 @@ import { useRouter } from "next/router";
 import { getSessionByAssignment, getSessionsByUser } from "@/utils/sessions.be";
 import { Session } from "@/hooks/useSessions";
 import moment from "moment";
+import { activeAssignmentFilter } from "@/utils/assignments";
 
 export const getServerSideProps = withIronSessionSsr(async ({ req, res, query }) => {
 	const user = await requestUser(req, res)
@@ -69,7 +70,7 @@ export default function Page({ user, assignment, exams = [], destinationURL = "/
 
 	useEffect(() => {
 		if (assignment && exams.length > 0 && !state.assignment && !session) {
-			if ((moment(assignment.startDate).isAfter(moment()) || moment(assignment.endDate).isBefore(moment())) && assignment.start) return
+			if (!activeAssignmentFilter(assignment)) return
 
 			state.setUserSolutions([]);
 			state.setShowSolutions(false);