diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index e7d917fee601..5779ed367fe8 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -795,12 +795,25 @@ def generate_report_data(self, user_state_iterator, limit_responses=None):
                 }
                 yield (user_state.username, report)
 
+    @property
+    def course_end_date(self):
+        """
+        Return the end date of the problem's course
+        """
+
+        try:
+            course_block_key = self.runtime.course_entry.structure['root']
+            return self.runtime.course_entry.structure['blocks'][course_block_key].fields['end']
+        except (AttributeError, KeyError):
+            return None
+
     @property
     def close_date(self):
         """
         Return the date submissions should be closed from.
         """
-        due_date = self.due
+
+        due_date = self.due or self.course_end_date
 
         if self.graceperiod is not None and due_date:
             return due_date + self.graceperiod
diff --git a/xmodule/tests/test_capa_block.py b/xmodule/tests/test_capa_block.py
index 42494547822e..5da29ac3d20e 100644
--- a/xmodule/tests/test_capa_block.py
+++ b/xmodule/tests/test_capa_block.py
@@ -11,7 +11,7 @@
 import random
 import textwrap
 import unittest
-from unittest.mock import DEFAULT, Mock, patch
+from unittest.mock import DEFAULT, Mock, patch, PropertyMock
 
 import pytest
 import ddt
@@ -656,6 +656,37 @@ def test_closed(self):
                                    due=self.yesterday_str)
         assert block.closed()
 
+    @patch.object(ProblemBlock, 'course_end_date', new_callable=PropertyMock)
+    def test_closed_for_archive(self, mock_course_end_date):
+
+        # Utility to create a datetime object in the past
+        def past_datetime(days):
+            return (datetime.datetime.now(UTC) - datetime.timedelta(days=days))
+
+        # Utility to create a datetime object in the future
+        def future_datetime(days):
+            return (datetime.datetime.now(UTC) + datetime.timedelta(days=days))
+
+        block = CapaFactory.create(max_attempts="1", attempts="0")
+
+        # For active courses without graceperiod
+        mock_course_end_date.return_value = future_datetime(10)
+        assert not block.closed()
+
+        # For archive courses without graceperiod
+        mock_course_end_date.return_value = past_datetime(10)
+        assert block.closed()
+
+        # For active courses with graceperiod
+        mock_course_end_date.return_value = future_datetime(10)
+        block.graceperiod = datetime.timedelta(days=2)
+        assert not block.closed()
+
+        # For archive courses with graceperiod
+        mock_course_end_date.return_value = past_datetime(2)
+        block.graceperiod = datetime.timedelta(days=3)
+        assert not block.closed()
+
     def test_parse_get_params(self):
 
         # Valid GET param dict