diff --git a/lmsege/lms/templates/lms/assignment_detail.html b/lmsege/lms/templates/lms/assignment_detail.html
index dfa091b..7e52596 100644
--- a/lmsege/lms/templates/lms/assignment_detail.html
+++ b/lmsege/lms/templates/lms/assignment_detail.html
@@ -22,7 +22,7 @@
 <div class="bg-white rounded-2xl shadow-sm border border-gray-100 p-6">
     <h3 class="text-xl font-semibold mb-4">Ваш ответ</h3>
     
-    {% if submission %}
+    {% if submission and submission.status != 'IN_PROGRESS' %}
         <div class="mb-6 p-4 rounded-lg border {% if submission.status == 'GRADED' %}bg-green-50 text-green-800 border-green-200{% else %}bg-yellow-50 text-yellow-800 border-yellow-200{% endif %}">
             {% if submission.status == 'GRADED' %}
                 <h4 class="font-bold mb-2">Оценка: {{ submission.grade|default:"Не выставлена" }}</h4>
diff --git a/lmsege/lms/views.py b/lmsege/lms/views.py
index db48349..f14117a 100644
--- a/lmsege/lms/views.py
+++ b/lmsege/lms/views.py
@@ -74,8 +74,9 @@ def assignment_detail(request, pk):
 
     if assignment.time_limit:
         if not submission:
-            needs_start = True
-            can_submit = False # Can't submit until started
+            if can_submit:
+                needs_start = True
+                can_submit = False # Can't submit until started
         elif submission.status == 'IN_PROGRESS':
             if submission.started_at:
                 elapsed = (now - submission.started_at).total_seconds()