diff --git a/openedx/core/djangoapps/user_authn/cookies.py b/openedx/core/djangoapps/user_authn/cookies.py
index d56958b808..24f929698f 100644
--- a/openedx/core/djangoapps/user_authn/cookies.py
+++ b/openedx/core/djangoapps/user_authn/cookies.py
@@ -251,7 +251,9 @@ def _get_user_info_cookie_data(request, user):
 
     # Add 'resume course' last completed block
     try:
-        header_urls['resume_block'] = retrieve_last_sitewide_block_completed(user)
+        block_url = retrieve_last_sitewide_block_completed(user)
+        if block_url:
+            header_urls['resume_block'] = block_url
     except User.DoesNotExist:
         pass
     except Exception as err:  # pylint: disable=broad-except
diff --git a/openedx/core/djangoapps/user_authn/tests/test_cookies.py b/openedx/core/djangoapps/user_authn/tests/test_cookies.py
index fa7c536f09..e46a515b6d 100644
--- a/openedx/core/djangoapps/user_authn/tests/test_cookies.py
+++ b/openedx/core/djangoapps/user_authn/tests/test_cookies.py
@@ -57,10 +57,12 @@ class CookieTests(TestCase):
     def _get_expected_header_urls(self):
         expected_header_urls = {
             'logout': reverse('logout'),
-            'resume_block': retrieve_last_sitewide_block_completed(self.user),
             'account_settings': reverse('account_settings'),
             'learner_profile': reverse('learner_profile', kwargs={'username': self.user.username}),
         }
+        block_url = retrieve_last_sitewide_block_completed(self.user)
+        if block_url:
+            expected_header_urls['resume_block'] = block_url
 
         expected_header_urls = self._convert_to_absolute_uris(self.request, expected_header_urls)