diff --git a/service/app/modules/OnRequestHandler.java b/service/app/modules/OnRequestHandler.java
index 04cb11c291ef4de3c9d8e0ec2e18c5547f8d5611..3b963086c3a3d769e0c64aae03ba75e7112ea66d 100644
--- a/service/app/modules/OnRequestHandler.java
+++ b/service/app/modules/OnRequestHandler.java
@@ -2,6 +2,8 @@ package modules;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.typesafe.config.ConfigFactory;
+
 import controllers.BaseController;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.auth.verifier.AccessTokenValidator;
@@ -60,10 +62,17 @@ public class OnRequestHandler implements ActionCreator {
       @Override
       public CompletionStage<Result> call(Http.Request request) {
         CompletionStage<Result> result = checkForServiceHealth(request);
-        if (result != null) return result;
+          String message = null;
+          if (result != null) {
+              return result;
+          }
+          if (ConfigFactory.load().getBoolean(JsonKey.AUTH_ENABLED)) {
+              message = RequestInterceptor.verifyRequestData(request);
+          } else {
+              message = JsonKey.ANONYMOUS;
+          }
         // Setting Actual userId (requestedBy) and managed userId (requestedFor) placeholders in flash memory to null before processing.
         // Unauthorized, Anonymous, UserID
-        String message = RequestInterceptor.verifyRequestData(request);
         Optional<String> forAuth = request.header(HeaderParam.X_Authenticated_For.getName());
         String childId = null;
         String loggingHeaders = getLoggingHeaders(request);
diff --git a/service/app/util/RequestInterceptor.java b/service/app/util/RequestInterceptor.java
index 9449d94a2c2425385dbeca0c0b7a5ef28bcca55b..0069d18ce6df525fc2e38f9ebe393da85183845a 100644
--- a/service/app/util/RequestInterceptor.java
+++ b/service/app/util/RequestInterceptor.java
@@ -10,9 +10,6 @@ import org.sunbird.common.models.util.JsonKey;
 import org.sunbird.common.models.util.LoggerUtil;
 import org.sunbird.common.models.util.ProjectLogger;
 import org.sunbird.common.request.HeaderParam;
-
-import com.typesafe.config.ConfigFactory;
-
 import play.mvc.Http;
 
 /**
@@ -57,12 +54,7 @@ public class RequestInterceptor {
    *     is returned
    */
   public static String verifyRequestData(Http.Request request) {
-    String clientId = null;
-    if(ConfigFactory.load().getBoolean(JsonKey.AUTH_ENABLED)){
-      clientId = JsonKey.UNAUTHORIZED;
-    }else{
-      clientId = JsonKey.ANONYMOUS;
-    }
+    String clientId = JsonKey.UNAUTHORIZED;
     Optional<String> accessToken = request.header(HeaderParam.X_Authenticated_User_Token.getName());
     Optional<String> authClientToken =
         request.header(HeaderParam.X_Authenticated_Client_Token.getName());