diff --git a/ees/rpc.go b/ees/rpc.go
index b9e330911..21eaeb82b 100644
--- a/ees/rpc.go
+++ b/ees/rpc.go
@@ -85,6 +85,12 @@ func (e *RPCee) GetMetrics() (mp *utils.SafeMapStorage) {
 }
 
 func (e *RPCee) PrepareMap(mp *utils.CGREvent) (interface{}, error) {
+	if mp == nil {
+		return nil, nil
+	}
+	if mp.APIOpts == nil {
+		mp.APIOpts = make(map[string]interface{})
+	}
 	for i, v := range e.Cfg().Opts.RPCAPIOpts {
 		mp.APIOpts[i] = v
 	}