diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/PipelineServiceClientFactory.java b/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/PipelineServiceClientFactory.java
index ed4f288fecf..799cb98d62a 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/PipelineServiceClientFactory.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/clients/pipeline/PipelineServiceClientFactory.java
@@ -35,6 +35,11 @@ public final class PipelineServiceClientFactory {
       return pipelineServiceClient;
     }
 
+    if (Boolean.FALSE.equals(config.getEnabled())) {
+      LOG.debug("Pipeline Service Client is disabled. Skipping initialization.");
+      return null;
+    }
+
     String pipelineServiceClientClass = config.getClassName();
     LOG.debug("Registering PipelineServiceClient: {}", pipelineServiceClientClass);
 
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/ServicesStatusJobHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/ServicesStatusJobHandler.java
index 457cf0852c2..2285b6a8cbb 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/ServicesStatusJobHandler.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/scheduled/ServicesStatusJobHandler.java
@@ -26,7 +26,7 @@ public class ServicesStatusJobHandler {
   public static final String PIPELINE_SERVICE_STATUS_JOB = "pipelineServiceStatusJob";
   public static final String STATUS_GROUP = "status";
   public static final String PIPELINE_STATUS_CRON_TRIGGER = "pipelineStatusTrigger";
-  public static final String DATABSE_SEARCH_STATUS_CRON_TRIGGER = "databaseAndSearchStatusTrigger";
+  public static final String DATABASE_SEARCH_STATUS_CRON_TRIGGER = "databaseAndSearchStatusTrigger";
   public static final String JOB_CONTEXT_PIPELINE_SERVICE_CLIENT = "pipelineServiceClient";
   public static final String JOB_CONTEXT_METER_REGISTRY = "meterRegistry";
   public static final String JOB_CONTEXT_CLUSTER_NAME = "clusterName";
@@ -112,7 +112,8 @@ public class ServicesStatusJobHandler {
           jobBuilder(
               DatabseAndSearchServiceStatusJob.class, DATABASE_SEARCH_STATUS_JOB, STATUS_GROUP);
       Trigger trigger =
-          getTrigger(servicesHealthCheckInterval, DATABSE_SEARCH_STATUS_CRON_TRIGGER, STATUS_GROUP);
+          getTrigger(
+              servicesHealthCheckInterval, DATABASE_SEARCH_STATUS_CRON_TRIGGER, STATUS_GROUP);
       scheduler.scheduleJob(jobDetail, trigger);
     } catch (Exception ex) {
       LOG.error("Failed in setting up job Scheduler for Pipeline Service Status", ex);
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppResource.java
index 29e57ebaef6..96b343317a6 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apps/AppResource.java
@@ -102,7 +102,6 @@ public class AppResource extends EntityResource<App, AppRepository> {
   private SearchRepository searchRepository;
   public static final List<ScheduleType> SCHEDULED_TYPES =
       List.of(ScheduleType.Scheduled, ScheduleType.ScheduledOrManual, ScheduleType.NoSchedule);
-  public static final String SLACK_APPLICATION = "SlackApplication";
   private final AppMapper mapper = new AppMapper();
 
   @Override