diff --git a/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx b/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx
index 7f3cda15a7..ba27bf88ac 100644
--- a/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx
+++ b/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx
@@ -60,6 +60,7 @@ import MonitorStepTraceMonitor, {
 import CheckboxElement from "Common/UI/Components/Checkbox/Checkbox";
 import MonitorTestForm from "./MonitorTest";
 import MonitorSteps from "Common/Types/Monitor/MonitorSteps";
+import ObjectID from "Common/Types/ObjectID";
 import Probe from "Common/Models/DatabaseModels/Probe";
 import MetricMonitorStepForm from "./MetricMonitor/MetricMonitorStepForm";
 import MonitorStepMetricMonitor, {
@@ -82,6 +83,7 @@ export interface ComponentProps {
   monitorType: MonitorType;
   allMonitorSteps: MonitorSteps;
   probes: Array<Probe>;
+  monitorId?: ObjectID | undefined; // this is used to populate secrets when testing the monitor.
 }
 
 const MonitorStepElement: FunctionComponent<ComponentProps> = (
@@ -824,6 +826,7 @@ return {
       {/** Monitor Test Form */}
       <div className="mt-5 mb-2">
         <MonitorTestForm
+          monitorId={props.monitorId}
           monitorSteps={props.allMonitorSteps}
           monitorType={props.monitorType}
           probes={props.probes}
diff --git a/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx b/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx
index 9f1837c3c3..da2409ad17 100644
--- a/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx
+++ b/Dashboard/src/Components/Form/Monitor/MonitorSteps.tsx
@@ -32,6 +32,7 @@ export interface ComponentProps extends CustomElementProps {
   initialValue?: MonitorSteps;
   monitorType: MonitorType;
   monitorName?: string | undefined; // this is used to prefill incident title and description. If not provided then it will be empty.
+  monitorId?: ObjectID | undefined; // this is used to populate secrets when testing the monitor.
 }
 
 const MonitorStepsElement: FunctionComponent<ComponentProps> = (
@@ -236,6 +237,7 @@ const MonitorStepsElement: FunctionComponent<ComponentProps> = (
               onCallPolicyDropdownOptions={onCallPolicyDropdownOptions}
               value={i}
               probes={probes}
+              monitorId={props.monitorId}
               /*
                * onDelete={() => {
                *     // remove the criteria filter
diff --git a/Dashboard/src/Pages/Monitor/View/Criteria.tsx b/Dashboard/src/Pages/Monitor/View/Criteria.tsx
index 407c118717..e90678b1aa 100644
--- a/Dashboard/src/Pages/Monitor/View/Criteria.tsx
+++ b/Dashboard/src/Pages/Monitor/View/Criteria.tsx
@@ -163,6 +163,7 @@ const MonitorCriteria: FunctionComponent<
                 <MonitorStepsForm
                   {...props}
                   monitorType={monitorType || MonitorType.Manual}
+                  monitorId={modelId}
                 />
               );
             },