diff --git a/src/components/Problems/Problem.tsx b/src/components/Problems/Problem.tsx
index 6041b6e9..602e449f 100644
--- a/src/components/Problems/Problem.tsx
+++ b/src/components/Problems/Problem.tsx
@@ -21,6 +21,7 @@ export const Problem: FC<{
   registered: boolean
   canRegister: boolean
   canSubmit: boolean
+  isAfterDeadline: boolean
   invalidateSeriesQuery: () => Promise<void>
   displayRegisterDialog: () => void
 }> = ({
@@ -29,6 +30,7 @@ export const Problem: FC<{
   setDisplaySideContent,
   canRegister,
   canSubmit,
+  isAfterDeadline,
   invalidateSeriesQuery,
   displayRegisterDialog,
 }) => {
@@ -73,6 +75,7 @@ export const Problem: FC<{
           problemId={problem.id}
           setDisplayProblemUploadForm={setDisplayProblemUploadForm}
           problemSubmitted={!!problem.submitted}
+          isAfterDeadline={isAfterDeadline}
           invalidateSeriesQuery={invalidateSeriesQuery}
           setDisplayActions={setDisplayActions}
         />
diff --git a/src/components/Problems/Problems.tsx b/src/components/Problems/Problems.tsx
index 158e0954..b1a4ac57 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'
@@ -53,6 +54,17 @@ export const Problems: FC = () => {
   const problems = series?.problems ?? []
   const semesterId = series?.semester ?? -1
   const canSubmit = series?.can_submit ?? false
+  const canResubmit = series?.can_resubmit ?? canSubmit
+  const [isAfterDeadline, setIsAfterDeadline] = useState<boolean>(new Date(series?.deadline ?? '') < new Date())
+
+  useInterval(
+    () => {
+      const isAfterDeadlineNew = new Date(series?.deadline ?? '') < new Date()
+      isAfterDeadlineNew !== isAfterDeadline && setIsAfterDeadline(isAfterDeadlineNew)
+    },
+    // Delay to null to stop it after deadline
+    isAfterDeadline ? null : 500,
+  )
 
   const [overrideCanRegister, setOverrideCanRegister] = useState<boolean>()
   const [overrideIsRegistered, setOverrideIsRegistered] = useState<boolean>()
@@ -118,7 +130,8 @@ export const Problems: FC = () => {
             setDisplaySideContent={setDisplaySideContent}
             registered={isRegistered}
             canRegister={canRegister}
-            canSubmit={canSubmit}
+            canSubmit={problem.submitted ? canResubmit : canSubmit}
+            isAfterDeadline={isAfterDeadline}
             invalidateSeriesQuery={invalidateSeriesQuery}
             displayRegisterDialog={() => setDisplayRegisterDialog(true)}
           />
diff --git a/src/components/Problems/UploadProblemForm.module.scss b/src/components/Problems/UploadProblemForm.module.scss
index 3891ec84..daaa723d 100644
--- a/src/components/Problems/UploadProblemForm.module.scss
+++ b/src/components/Problems/UploadProblemForm.module.scss
@@ -10,6 +10,10 @@
   position: relative;
 }
 
+.inputWrapper {
+  position: relative;
+}
+
 .files {
   margin-top: 8px;
   display: grid;
@@ -39,5 +43,6 @@
 
 .closeButton {
   position: absolute;
-  right: 0;
+  right: 2px;
+  top: 2px;
 }
diff --git a/src/components/Problems/UploadProblemForm.module.scss.d.ts b/src/components/Problems/UploadProblemForm.module.scss.d.ts
index 16c963c3..1f67a88d 100644
--- a/src/components/Problems/UploadProblemForm.module.scss.d.ts
+++ b/src/components/Problems/UploadProblemForm.module.scss.d.ts
@@ -4,6 +4,7 @@ export type Styles = {
   closeButton: string
   container: string
   files: string
+  inputWrapper: string
   problemSubmitted: string
 }
 
diff --git a/src/components/Problems/UploadProblemForm.tsx b/src/components/Problems/UploadProblemForm.tsx
index 817f9929..f9f982c0 100644
--- a/src/components/Problems/UploadProblemForm.tsx
+++ b/src/components/Problems/UploadProblemForm.tsx
@@ -7,22 +7,23 @@ import {CloseButton} from '@/components/CloseButton/CloseButton'
 import {niceBytes} from '@/utils/niceBytes'
 
 import {Button} from '../Clickable/Clickable'
+import {Dialog} from '../Dialog/Dialog'
 import {FileDropZone} from '../FileDropZone/FileDropZone'
 import styles from './UploadProblemForm.module.scss'
 
 export const UploadProblemForm: FC<{
   problemId: number
   setDisplayProblemUploadForm: Dispatch<SetStateAction<boolean>>
-  problemSubmitted?: boolean
+  problemSubmitted: boolean
+  isAfterDeadline: boolean
   setDisplayActions: Dispatch<SetStateAction<boolean>>
   invalidateSeriesQuery: () => Promise<void>
 }> = ({
   problemId,
   setDisplayActions,
   setDisplayProblemUploadForm,
-  // problemNumber,
   problemSubmitted,
-  // setDisplaySideContent,
+  isAfterDeadline,
   invalidateSeriesQuery,
 }) => {
   const {mutate: uploadSolution} = useMutation({
@@ -42,7 +43,7 @@ export const UploadProblemForm: FC<{
   })
 
   const [files, setFiles] = useState<File | undefined>(undefined)
-  const {acceptedFiles, fileRejections, getRootProps, getInputProps} = useDropzone({
+  const {fileRejections, getRootProps, getInputProps} = useDropzone({
     multiple: false,
     accept: {
       'application/pdf': ['.pdf'],
@@ -68,34 +69,67 @@ export const UploadProblemForm: FC<{
     setDisplayActions(true)
   }
 
+  const [displayAlertDialog, setDisplayAlertDialog] = useState<boolean>(problemSubmitted)
+  const closeAlertDialog = () => setDisplayAlertDialog(false)
+  const cancel = () => {
+    closeAlertDialog()
+    setDisplayProblemUploadForm(false)
+    setDisplayActions(true)
+  }
+
+  const alertMessage = isAfterDeadline
+    ? 'Toto riešenie nahrávaš PO TERMÍNE. Nahraním nového riešenia prepíšeš svoje predošlé odovzdanie a pri hodnotení budeme zohľadnovať len toto nové riešenie.'
+    : 'Nahraním nového riešenia prepíšeš svoje predošlé odovzdanie a pri hodnotení budeme zohľadnovať len toto nové riešenie.'
+
   return (
     <div className={styles.container}>
-      <CloseButton onClick={handleCloseButton} size={24} invertColors className={styles.closeButton} />
+      {isAfterDeadline && <div className={styles.problemSubmitted}>Toto riešenie už nahrávaš po termíne.</div>}
       {problemSubmitted && (
         <div className={styles.problemSubmitted}>
           Pozor, nahraním nového riešenia prepíšeš svoje predošlé odovzdanie.
         </div>
       )}
-      {!files && (
-        <FileDropZone getRootProps={getRootProps} getInputProps={getInputProps} text="Vlož riešenie vo formáte pdf" />
-      )}
-      {files?.name && (
-        <div className={styles.files}>
-          <div>
-            <b>Súbor: </b>
+      <Dialog
+        open={displayAlertDialog}
+        close={closeAlertDialog}
+        title="Pozor"
+        contentText={alertMessage}
+        actions={
+          <>
+            <Button onClick={cancel}>Zrušiť</Button>
+            <Button onClick={closeAlertDialog}>Pokračovať</Button>
+          </>
+        }
+      />
+      <div className={styles.inputWrapper}>
+        {!files && (
+          <>
+            <CloseButton onClick={handleCloseButton} size={24} invertColors className={styles.closeButton} />
+            <FileDropZone
+              getRootProps={getRootProps}
+              getInputProps={getInputProps}
+              text="Vlož riešenie vo formáte pdf"
+            />
+          </>
+        )}
+        {files?.name && (
+          <div className={styles.files}>
+            <div>
+              <b>Súbor: </b>
 
-            <span>
-              {files.name} ({niceBytes(files.size)})
-            </span>
-          </div>
-          <div className={styles.actions}>
-            <Button onClick={handleSubmit}>Uložiť</Button>
-            <Button onClick={handleRemoveSelection}>Zrušiť</Button>
-          </div>
+              <span>
+                {files.name} ({niceBytes(files.size)})
+              </span>
+            </div>
+            <div className={styles.actions}>
+              <Button onClick={handleSubmit}>Uložiť</Button>
+              <Button onClick={handleRemoveSelection}>Zrušiť</Button>
+            </div>
 
-          {/* {fileRejections.length > 0 && <span>Nahraný súbor musí byť vo formáte pdf.</span>} */}
-        </div>
-      )}
+            {fileRejections.length > 0 && <span>Nahraný súbor musí byť vo formáte pdf.</span>}
+          </div>
+        )}
+      </div>
     </div>
   )
 }
diff --git a/src/types/api/competition.ts b/src/types/api/competition.ts
index 45875149..8403bb0e 100644
--- a/src/types/api/competition.ts
+++ b/src/types/api/competition.ts
@@ -148,6 +148,7 @@ export interface SeriesWithProblems {
   is_registered: boolean
   problems: Problem[]
   can_submit: boolean
+  can_resubmit: boolean
   order: number
   deadline: string
   complete: boolean