diff --git a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts
index bb5fd37b2..52f90b298 100644
--- a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts
+++ b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.component.spec.ts
@@ -784,4 +784,22 @@ describe('PoPageJobSchedulerComponent:', () => {
       expect(executionElementHiddenAttribute).toBeFalsy();
     });
   });
+
+  it(`getSteps: should use 'literals' when the parameterization step title is not defined`, () => {
+    const mock = Object.assign(new QueryList(), {
+      _results: [{}, {}],
+      length: 1
+    }) as QueryList<PoJobSchedulerParametersTemplateDirective>;
+
+    component.parametersTemplate = mock;
+    component['getSteps']();
+
+    const result = component['steps'].slice(1, -1);
+    const resultExpected = [
+      { label: `${component['literals']['parameterization']} 1` },
+      { label: `${component['literals']['parameterization']} 2` }
+    ];
+
+    expect(result).toEqual(resultExpected);
+  });
 });
diff --git a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts
index 429e868ba..4f005e93f 100644
--- a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts
+++ b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.spec.ts
@@ -378,6 +378,25 @@ describe('PoPageJobSchedulerService:', () => {
       expect(poPageJobSchedulerService['removeInvalidKeys']).toHaveBeenCalledWith(jobSchedulerInternal);
     });
 
+    it(`convertToJobScheduler: should ignore when 'firstExecutionHour' is set but 'firstExecution' is not set`, () => {
+      const jobSchedulerInternal = {
+        executionParameter: 'value',
+        firstExecution: undefined,
+        firstExecutionHour: '15:30',
+        processID: '1'
+      };
+
+      const jobSchedulerInternalExpected = {
+        executionParameter: 'value',
+        firstExecution: undefined,
+        processID: '1'
+      };
+
+      const result = <any>poPageJobSchedulerService['convertToJobScheduler'](jobSchedulerInternal);
+
+      expect(result).toEqual(jobSchedulerInternalExpected);
+    });
+
     it(`convertToJobSchedulerInternal: should set 'jobSchedulerInternal.firstExecutionHour' with 'getHourFirstExecution'
       return if 'firstExecution' is defined`, () => {
       const jobSchedulerInternal = {
@@ -482,6 +501,7 @@ describe('PoPageJobSchedulerService:', () => {
 
       expect(result).toEqual(jobSchedulerInternalExpected);
     });
+
     it(`convertToJobSchedulerInternal: should return the merge between 'jobSchedulerInternal' and
       the return from 'convertToPeriodicityInternal'`, () => {
       const jobSchedulerInternal = {
@@ -787,6 +807,15 @@ describe('PoPageJobSchedulerService:', () => {
       );
     });
 
+    it(`replaceHourFirstExecution: should replace hour add time zone`, () => {
+      const stringDate = new Date().toString();
+      const timeZone = `${stringDate.substring(28, 31)}:${stringDate.substring(31, 33)}`;
+
+      const result = `2025-12-24T23:59:00${timeZone}`;
+
+      expect(poPageJobSchedulerService['replaceHourFirstExecution']('2025-12-24', '23:59')).toBe(result);
+    });
+
     it('returnValidExecutionParameter: should remove keys that have undefined value', () => {
       const parameter = {
         numberKey: 1,
diff --git a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts
index 2a2c6d7ed..319f51b76 100644
--- a/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts
+++ b/projects/templates/src/lib/components/po-page-job-scheduler/po-page-job-scheduler.service.ts
@@ -232,6 +232,10 @@ export class PoPageJobSchedulerService {
   }
 
   private replaceHourFirstExecution(date: string, time: string): string {
+    if (!date) {
+      return date;
+    }
+
     const dateSplited = date.split('-');
     const year = parseInt(dateSplited[0]);
     const monthIndex = parseInt(dateSplited[1]) - 1;