diff --git a/logger.go b/logger.go
index 8d095ee..aae2505 100644
--- a/logger.go
+++ b/logger.go
@@ -10,9 +10,10 @@ import (
 )
 
 var (
-	logsClient   *Client
-	gserviceName string
-	gserviceType string
+	logsClient              *Client
+	gserviceName            string
+	gserviceType            string
+	grabbitMqLoggingEnabled bool
 )
 
 const RabbitMqQueueLogs = "cnj.logs"
@@ -30,6 +31,8 @@ func InitLogger(debug bool, colorizedOutput bool, rabbitMqLogging bool, rabbitMq
 		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: "15:04:05"})
 	}
 
+	grabbitMqLoggingEnabled = rabbitMqLogging
+
 	if rabbitMqLogging {
 		gserviceName = serviceName
 		gserviceType = serviceType
@@ -106,6 +109,10 @@ type RabbitMqLogMessage struct {
 }
 
 func pushLogMessage(messageType uint8, logMsg string) {
+	if !grabbitMqLoggingEnabled {
+		return
+	}
+
 	rabbitMqLogMessage := RabbitMqLogMessage{
 		MessageType: messageType,
 		ServiceName: gserviceName,
@@ -114,7 +121,7 @@ func pushLogMessage(messageType uint8, logMsg string) {
 		Timestamp:   time.Now().Unix(),
 	}
 
-	LogInfof("serviceType %s serviceName %s", gserviceName, gserviceName)
+	LogInfof("serviceType %s serviceName %s", gserviceType, gserviceName)
 
 	msg, err := json.Marshal(rabbitMqLogMessage)