diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 79fea90..605ccac 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -466,26 +466,28 @@ export class SalaryPeriodController extends Controller {
       if (salaryRanks != null) {
         if (salaryProfile.type == "HAFT") {
           if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULL") {
           if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
             if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
               type = "HAFT";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFull,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULLHAFT") {
           if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@@ -497,13 +499,14 @@ export class SalaryPeriodController extends Controller {
             ) {
               type = "FULL";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFullHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         }
       } else {
@@ -931,26 +934,28 @@ export class SalaryPeriodController extends Controller {
       if (salaryRanks != null) {
         if (salaryProfile.type == "HAFT") {
           if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULL") {
           if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
             if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
               type = "HAFT";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFull,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULLHAFT") {
           if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@@ -962,13 +967,14 @@ export class SalaryPeriodController extends Controller {
             ) {
               type = "FULL";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFullHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         }
       } else {
@@ -1382,26 +1388,28 @@ export class SalaryPeriodController extends Controller {
       if (salaryRanks != null) {
         if (salaryProfile.type == "HAFT") {
           if (salaryRanks.salaryHalfSpecial != null && salaryRanks.salaryHalfSpecial > 0) {
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULL") {
           if (salaryRanks.salaryFullSpecial != null && salaryRanks.salaryFullSpecial > 0) {
             if (salaryRanks.salaryHalfSpecial == null || salaryRanks.salaryHalfSpecial == 0) {
               type = "HAFT";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFull,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         } else if (salaryProfile.type == "FULLHAFT") {
           if (salaryRanks.salaryFullHalfSpecial != null && salaryRanks.salaryFullHalfSpecial > 0) {
@@ -1413,13 +1421,14 @@ export class SalaryPeriodController extends Controller {
             ) {
               type = "FULL";
             }
-            salaryRanks = await this.salaryRankRepository.findOne({
+            const _salaryRanks = await this.salaryRankRepository.findOne({
               where: {
                 salaryId: salarys.id,
                 salary: salaryRanks.salaryFullHalf,
                 isNext: true,
               },
             });
+            salaryRanks = _salaryRanks == null ? salaryRanks : _salaryRanks;
           }
         }
       } else {