diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index b1724784c..19a0085d2 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -243,9 +243,9 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) {
 		controller.AlertsAddChan = apiClient.AlertsAddChan
 
 		if apiClient.apiClient.IsEnrolled() {
-			log.Infof("Machine is enrolled in the console, Loading PAPI Client")
-
 			if config.ConsoleConfig.IsPAPIEnabled() {
+				log.Info("Machine is enrolled in the console, Loading PAPI Client")
+
 				papiClient, err = NewPAPI(apiClient, dbClient, config.ConsoleConfig, *config.PapiLogLevel)
 				if err != nil {
 					return nil, err