diff --git a/DGCAVerifier/Services/GatewayConnection.swift b/DGCAVerifier/Services/GatewayConnection.swift
index a52a67e..fdc0e8c 100644
--- a/DGCAVerifier/Services/GatewayConnection.swift
+++ b/DGCAVerifier/Services/GatewayConnection.swift
@@ -299,9 +299,11 @@ extension GatewayConnection {
   }
   
   static func loadValueSetsFromServer(completion: (([CertLogic.ValueSet]) -> Void)? = nil) {
-    DataCenter.valueSets.forEach { DataCenter.valueSetsDataManager.add(valueSet: $0) }
-    DataCenter.saveSets { result in
-      completion?(DataCenter.valueSets)
+    getListOfValueSets { valueSetsList in
+      valueSetsList.forEach { DataCenter.valueSetsDataManager.add(valueSet: $0) }
+      DataCenter.saveSets { result in
+        completion?(DataCenter.valueSets)
+      }
     }
   }
 }