diff --git a/scheduler/inc/scheduler_core.h b/scheduler/inc/scheduler_core.h
index 0f02efdf15..3aed3b44bc 100644
--- a/scheduler/inc/scheduler_core.h
+++ b/scheduler/inc/scheduler_core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -34,6 +34,12 @@
 #define SCHEDULER_WRAPPER_MAX_FAIL_COUNT (SCHEDULER_CORE_MAX_MESSAGES * 3)
 #define SCHEDULER_WATCHDOG_TIMEOUT (10 * 1000) /* 10s */
 
+#ifdef CONFIG_AP_PLATFORM
+#define SCHED_DEBUG_PANIC(msg)
+#else
+#define SCHED_DEBUG_PANIC(msg) QDF_DEBUG_PANIC(msg)
+#endif
+
 #define sched_fatal(params...) \
 	QDF_TRACE_FATAL(QDF_MODULE_ID_SCHEDULER, params)
 #define sched_err(params...) \
diff --git a/scheduler/src/scheduler_api.c b/scheduler/src/scheduler_api.c
index 7404e16c83..20a84a6415 100644
--- a/scheduler/src/scheduler_api.c
+++ b/scheduler/src/scheduler_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -63,7 +63,7 @@ static inline void scheduler_watchdog_notify(struct scheduler_ctx *sched)
 	sched_fatal("Callback %s (type 0x%x) exceeded its allotted time of %ds",
 		    sched->watchdog_callback ? symbol : "<null>",
 		    sched->watchdog_msg_type,
-		    SCHEDULER_WATCHDOG_TIMEOUT / 1000);
+		    sched->timeout / 1000);
 }
 
 static void scheduler_watchdog_timeout(void *arg)
@@ -83,7 +83,7 @@ static void scheduler_watchdog_timeout(void *arg)
 	if (qdf_atomic_test_bit(MC_SHUTDOWN_EVENT_MASK, &sched->sch_event_flag))
 		return;
 
-	QDF_DEBUG_PANIC("Going down for Scheduler Watchdog Bite!");
+	SCHED_DEBUG_PANIC("Going down for Scheduler Watchdog Bite!");
 }
 
 QDF_STATUS scheduler_enable(void)