diff --git a/ekms/etsiqkdnclient/etsi-qkdn-client.go b/ekms/etsiqkdnclient/etsi-qkdn-client.go
index 4ff54d68e3bae3a5c2ac78ef92a4844583c29c83..f33fa60c1f5e08793aa30539d8633ea0e008a69b 100644
--- a/ekms/etsiqkdnclient/etsi-qkdn-client.go
+++ b/ekms/etsiqkdnclient/etsi-qkdn-client.go
@@ -130,9 +130,6 @@ func emulatedKMS(config *Config, id uuid.UUID, peerChannel chan string) *kms.EKM
 	// Attach to eKMS
 	emuKMS := kms.NewEKMS(config.Name, id, os.Stdout, log.TraceLevel, false, config.InterComAddr, config.AkmsURL)
 
-	// Create AKMSReceiverServer object
-	akmsCkmsReceiverServer := akmsCkmsServer.NewAKMSReceiver(config.AkmsCkmsServerPort, emuKMS)
-
 	var qm kms.QuantumModule
 	var err error
 	for _, peer := range config.Peers {
@@ -177,7 +174,10 @@ func emulatedKMS(config *Config, id uuid.UUID, peerChannel chan string) *kms.EKM
 	go kms.StartETSI(config.GRPCAddr, emuKMS)
 
 	// Start the akmsCkmsReceiverServer
-	go akmsCkmsReceiverServer.Serve()
+	if config.AkmsCkmsServerPort != "" {
+		akmsCkmsReceiverServer := akmsCkmsServer.NewAKMSReceiver(config.AkmsCkmsServerPort, emuKMS)
+		go akmsCkmsReceiverServer.Serve()
+	}
 
 	return emuKMS
 }