diff --git a/goKMS/kms/peers/etsi14Quantummodule.go b/goKMS/kms/peers/etsi14Quantummodule.go
index 97d164c286ec1ff8aab9f36061eebe4d7932ae9d..04bada91bef9d1f51d77e3d98a38827c5a075ede 100644
--- a/goKMS/kms/peers/etsi14Quantummodule.go
+++ b/goKMS/kms/peers/etsi14Quantummodule.go
@@ -18,15 +18,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const (
-	maxFailedKeyRequestAttempts = 10
-	defaultKeyFetchInterval     = 10
-	defaultKeyFetchAmount       = int64(1)
-	defualtMaxKeyFillLevel      = uint64(100)
-
-	backgroundKeyStoreUpdateInterval = 1
-)
-
 type ETSI014HTTPQuantumModule struct {
 	id               uuid.UUID
 	kmsId            string
@@ -88,7 +79,7 @@ func NewETSI014HTTPQuantumModule(addr, kmsId, localSAEID, targetSAEID string, tl
 	}
 
 	if maxKeyFillLevel == 0 {
-		maxKeyFillLevel = defualtMaxKeyFillLevel
+		maxKeyFillLevel = DefaultMaxKeyFillLevel
 	}
 
 	return &ETSI014HTTPQuantumModule{
diff --git a/goKMS/kms/peers/quantummodule.go b/goKMS/kms/peers/quantummodule.go
index 6e12f0524dfdaa53c1277219c9c99c71c988e2a6..3b7d9c5fcb2ac28a2c8d0156b94333e642856c8f 100644
--- a/goKMS/kms/peers/quantummodule.go
+++ b/goKMS/kms/peers/quantummodule.go
@@ -6,6 +6,15 @@ import (
 	"github.com/google/uuid"
 )
 
+const (
+	maxFailedKeyRequestAttempts = 10
+	defaultKeyFetchInterval     = 10
+	defaultKeyFetchAmount       = int64(1)
+	DefaultMaxKeyFillLevel      = uint64(100)
+
+	backgroundKeyStoreUpdateInterval = 1
+)
+
 // QuantumModule interface definition.
 type QuantumModule interface {
 	ID() uuid.UUID
diff --git a/goKMS/main.go b/goKMS/main.go
index aca7e904cd79616773e1500baa83f02525f46c8f..812d57c9ba0ea76cb86b86b5faaa6d7830c01b24 100644
--- a/goKMS/main.go
+++ b/goKMS/main.go
@@ -43,6 +43,7 @@ import (
 	kmsHandler "code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/kms"
 	"code.fbi.h-da.de/danet/quant/goKMS/gnmiHandlers/system"
 	"code.fbi.h-da.de/danet/quant/goKMS/kms"
+	"code.fbi.h-da.de/danet/quant/goKMS/kms/peers"
 	"code.fbi.h-da.de/danet/quant/goKMS/kms/receiver"
 	gnmitargetygot "code.fbi.h-da.de/danet/quant/goKMS/model"
 	qkdnmanager "code.fbi.h-da.de/danet/quant/goKMS/qkdnManager"
@@ -237,11 +238,17 @@ func setupQkdnManagerServer(kms *kms.KMS, config config.QkdnManagerServer) {
 	cancel()
 }
 
-func getMaxKeyFillLevelsFromConfig(peers []config.Peer) map[string]uint64 {
+func getMaxKeyFillLevelsFromConfig(configPeers []config.Peer) map[string]uint64 {
 	maxKeyFillLevels := make(map[string]uint64, 0)
 
-	for _, peer := range peers {
-		maxKeyFillLevels[peer.PeerId] = uint64(peer.QuantumModule.MaxKeyFillLevel)
+	for _, peer := range configPeers {
+		maxKeyFillLevel := uint64(peer.QuantumModule.MaxKeyFillLevel)
+
+		if maxKeyFillLevel == 0 {
+			maxKeyFillLevel = peers.DefaultMaxKeyFillLevel
+		}
+
+		maxKeyFillLevels[peer.PeerId] = maxKeyFillLevel
 	}
 
 	return maxKeyFillLevels