diff --git a/repository/src/main/java/org/apache/atlas/tasks/TaskQueueWatcher.java b/repository/src/main/java/org/apache/atlas/tasks/TaskQueueWatcher.java
index 25478e9a5a..9214cbfbf9 100644
--- a/repository/src/main/java/org/apache/atlas/tasks/TaskQueueWatcher.java
+++ b/repository/src/main/java/org/apache/atlas/tasks/TaskQueueWatcher.java
@@ -76,6 +76,11 @@ public void shutdown() {
 
     @Override
     public void run() {
+        boolean isMaintenanceMode = AtlasConfiguration.ATLAS_MAINTENANCE_MODE.getBoolean();
+        if (isMaintenanceMode) {
+            LOG.info("TaskQueueWatcher: Maintenance mode is enabled, new tasks will not be loaded into the queue until next restart");
+            return;
+        }
         shouldRun.set(true);
 
         if (LOG.isDebugEnabled()) {
diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
index bb0b82a417..c3353f19c4 100644
--- a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
+++ b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
@@ -88,7 +88,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
             // Block all the POST, PUT, DELETE operations
             HttpServletRequest request = (HttpServletRequest) servletRequest;
             HttpServletResponse response = (HttpServletResponse) servletResponse;
-            if (isBlockedMethod(request.getMethod()) && !request.getRequestURI().contains("indexsearch")) {
+            if (isBlockedMethod(request.getMethod()) && !request.getRequestURI().contains("search") &&
+                    !request.getRequestURI().contains("lineage")) {
                 LOG.error("Maintenance mode enabled. Blocking request: {}", request.getRequestURI());
                 sendMaintenanceModeResponse(response);
                 return; // Stop further processing