diff --git a/src/components/Problems/Problems.tsx b/src/components/Problems/Problems.tsx
index 88a0d1a0..437dd129 100644
--- a/src/components/Problems/Problems.tsx
+++ b/src/components/Problems/Problems.tsx
@@ -2,6 +2,7 @@ import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import axios from 'axios'
 import {useRouter} from 'next/router'
 import {FC, useState} from 'react'
+import {useInterval} from 'usehooks-ts'
 
 import {Button, Link} from '@/components/Clickable/Clickable'
 import {SeriesWithProblems} from '@/types/api/competition'
@@ -54,7 +55,16 @@ export const Problems: FC = () => {
   const semesterId = series?.semester ?? -1
   const canSubmit = series?.can_submit ?? false
   const canResubmit = series?.can_resubmit ?? canSubmit
-  const isAfterDeadline = new Date(series?.deadline ?? '') < new Date()
+  const [isAfterDeadline, setIsAfterDeadline] = useState<boolean>(new Date(series?.deadline ?? '') < new Date())
+
+  useInterval(
+    () => {
+      const isAfterDeadlineNew = new Date(series?.deadline ?? '') < new Date()
+      isAfterDeadlineNew && setIsAfterDeadline(isAfterDeadlineNew)
+    },
+    // Delay to null to stop it after deadline
+    isAfterDeadline ? null : 1,
+  )
 
   const [overrideCanRegister, setOverrideCanRegister] = useState<boolean>()
   const [overrideIsRegistered, setOverrideIsRegistered] = useState<boolean>()
@@ -120,7 +130,7 @@ export const Problems: FC = () => {
             setDisplaySideContent={setDisplaySideContent}
             registered={isRegistered}
             canRegister={canRegister}
-            canSubmit={(canSubmit && !problem.submitted) || (!!problem.submitted && canResubmit)}
+            canSubmit={problem.submitted ? canResubmit : canSubmit}
             isAfterDeadline={isAfterDeadline}
             invalidateSeriesQuery={invalidateSeriesQuery}
             displayRegisterDialog={() => setDisplayRegisterDialog(true)}