diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go
index 678637c62..f690afb38 100644
--- a/cmd/cgr-rater/cgr-rater.go
+++ b/cmd/cgr-rater/cgr-rater.go
@@ -256,7 +256,7 @@ func main() {
 		go stopRaterSingnalHandler()
 	}
 	responder := &timespans.Responder{ExitChan: exitChan}
-	if rater_enabled && !balancer_enabled {
+	if rater_enabled && !balancer_enabled && rater_listen != INTERNAL {
 		go listenToRPCRequests(responder, rater_listen, rater_rpc_encoding)
 	}
 	if balancer_enabled {
diff --git a/cmd/cgr-rater/scheduler.go b/cmd/cgr-rater/scheduler.go
index 5cda72fcd..afadca763 100644
--- a/cmd/cgr-rater/scheduler.go
+++ b/cmd/cgr-rater/scheduler.go
@@ -37,6 +37,9 @@ type scheduler struct {
 
 func (s scheduler) loop() {
 	for {
+		if len(s.queue) == 0 {
+			<-restartLoop
+		}
 		a0 := s.queue[0]
 		now := time.Now()
 		if a0.GetNextStartTime().Equal(now) || a0.GetNextStartTime().Before(now) {