diff --git a/goKMS/kms/peers/etsi14Quantummodule.go b/goKMS/kms/peers/etsi14Quantummodule.go
index c2af33183fd9ade86018d08619c09f588827dfd0..a53e5053ce3d82b4c97ebac63e6dc475bc68c97b 100644
--- a/goKMS/kms/peers/etsi14Quantummodule.go
+++ b/goKMS/kms/peers/etsi14Quantummodule.go
@@ -113,17 +113,9 @@ func (qm *ETSI014HTTPQuantumModule) Initialize() error {
 			ticker := time.NewTicker(restartWaitingTime)
 			defer ticker.Stop()
 
-			restartedAfterWaitingTime := new(int)
-
 			// immediately start with the ticker instead of waiting the defined amount
 			for ; true; <-ticker.C {
-				if *restartedAfterWaitingTime == 5 {
-					log.Fatalf("Stopped retrying to fetch keys after %d attempts waiting %v each time in between.", restartedAfterWaitingTime, restartWaitingTime)
-					break
-				}
-
-				qm.doKeyFetching(restartedAfterWaitingTime)
-				*restartedAfterWaitingTime++
+				qm.doKeyFetching()
 			}
 		}()
 	}
@@ -184,7 +176,7 @@ func (qm *ETSI014HTTPQuantumModule) GetKeyWithIds(keyIds []etsi14ClientGenerated
 	return container, nil
 }
 
-func (qm *ETSI014HTTPQuantumModule) doKeyFetching(restartedAfterWaitingTime *int) {
+func (qm *ETSI014HTTPQuantumModule) doKeyFetching() {
 	ticker := time.NewTicker(time.Duration(qm.keyFetchInterval) * time.Second)
 	defer ticker.Stop()
 
@@ -230,7 +222,6 @@ func (qm *ETSI014HTTPQuantumModule) doKeyFetching(restartedAfterWaitingTime *int
 			}
 
 			failedAttemps = 0
-			*restartedAfterWaitingTime = 0
 		}
 	}
 }