diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UserAgreementFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UserAgreementFilter.java
index 39f027f1189c..d23d84a9a401 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UserAgreementFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UserAgreementFilter.java
@@ -52,14 +52,13 @@ public UserAgreementFilter(ConfigurationService configurationService) {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
         throws ServletException, IOException {
 
-        Context context = ContextUtil.obtainContext(request);
-
         boolean filterEnabled = configurationService.getBooleanProperty("user-agreement.enabled", false);
         if (!filterEnabled) {
             filterChain.doFilter(request, response);
             return;
         }
 
+        Context context = ContextUtil.obtainContext(request);
         EPerson currentUser = context.getCurrentUser();
         if (isNotOpenPath(request) && currentUser != null) {
             boolean isUserAgreementAccepted = BooleanUtils
@@ -81,4 +80,4 @@ private boolean isNotOpenPath(HttpServletRequest request) {
             .noneMatch(openPath -> openPath.matches(request));
     }
 
-}
\ No newline at end of file
+}