diff --git a/openedx/core/djangoapps/user_api/accounts/settings_views.py b/openedx/core/djangoapps/user_api/accounts/settings_views.py
index a1e65e5677..1ba4ead4a7 100644
--- a/openedx/core/djangoapps/user_api/accounts/settings_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/settings_views.py
@@ -111,7 +111,7 @@ def _get_custom_context(self, extended_profile_fields):
             if options:
                 field_options[field_name] = options
 
-            return field_options, field_labels
+        return field_options, field_labels
 
 
 class AccountSettingsRenderStarted(OpenEdxPublicFilter):