diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py
index 04606b4c..f980b1d8 100644
--- a/odevzdavatko/views.py
+++ b/odevzdavatko/views.py
@@ -416,7 +416,12 @@ class NahrajReseniView(LoginRequiredMixin, CreateView):
 		return super().get(request, *args, **kwargs)
 
 	def get_initial(self):
-		return {"nadproblem_id": self.kwargs["nadproblem_id"]}
+		nadproblem_id = self.kwargs["nadproblem_id"]
+		return {
+			"nadproblem_id": nadproblem_id,
+			"problem": [] if m.Problem.objects.filter(stav=m.Problem.STAV_ZADANY, nadproblem__id=nadproblem_id) else nadproblem_id
+
+		}
 
 	def get_context_data(self,**kwargs):
 		data = super().get_context_data(**kwargs)