diff --git a/internal/use-case/main-use-case/encounter/helper.go b/internal/use-case/main-use-case/encounter/helper.go
index 1f78d73e..99b080ab 100644
--- a/internal/use-case/main-use-case/encounter/helper.go
+++ b/internal/use-case/main-use-case/encounter/helper.go
@@ -559,7 +559,6 @@ func getSoapiByResponsibleDoctor(enc e.Encounter, event *pl.Event) (data []es.So
 	}
 
 	err = dg.I.
-		Debug().
 		Model(&es.Soapi{}).
 		Joins("JOIN \"Employee\" ON \"Employee\".\"Id\" = \"Soapi\".\"Employee_Id\"").
 		Where("\"Encounter_Id\" = ?", enc.Id).
@@ -723,16 +722,26 @@ func determineVisitMode(recentRehabData *er.Rehab, input e.CreateDto, event *pl.
 			return "", nil, err
 		}
 
-		if !isQuotaValid || recentRehabData.ExpiredAt.Before(*pu.GetTimeNow()) {
+		if !isQuotaValid {
 			event.Status = "failed"
 			event.ErrInfo = pl.ErrorInfo{
 				Code:   "visit-limit-exceeded",
-				Detail: "Encounter has exceeded the allowed number of visits or expired",
+				Detail: "Encounter has exceeded the allowed number of visits",
 				Raw:    errors.New("visit count exceeds allowed limit"),
 			}
 			return "", nil, pl.SetLogError(event, input)
 		}
 
+		if recentRehabData.ExpiredAt != nil && recentRehabData.ExpiredAt.Before(*pu.GetTimeNow()) {
+			event.Status = "failed"
+			event.ErrInfo = pl.ErrorInfo{
+				Code:   "visit-limit-exceeded",
+				Detail: "Encounter period has expired",
+				Raw:    errors.New("encounter expired"),
+			}
+			return "", nil, pl.SetLogError(event, input)
+		}
+
 	case erc.DSCDone:
 		visitModeCode = ere.VMCAdm
 
diff --git a/internal/use-case/main-use-case/encounter/lib.go b/internal/use-case/main-use-case/encounter/lib.go
index 22259c09..d3cc544e 100644
--- a/internal/use-case/main-use-case/encounter/lib.go
+++ b/internal/use-case/main-use-case/encounter/lib.go
@@ -312,7 +312,7 @@ func verifyAllocatedVisitCount(i e.CreateDto, event *pl.Event) (e.Encounter, boo
 	}
 
 	// validate count rehab children
-	if recentEncounterAdm.RehabChildren != nil {
+	if recentEncounterAdm.RehabChildren != nil && len(*recentEncounterAdm.RehabChildren) > 0 {
 		valid = len(*recentEncounterAdm.RehabChildren) < *recentEncounterAdm.Rehab.AllocatedVisitCount
 	}