diff --git a/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift b/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift
index 072ea0cb51..fb11385736 100644
--- a/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift	
+++ b/src/xcode/ENA/ENA/Source/AppDelegate & Globals/AppDelegate.swift	
@@ -799,8 +799,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, CoronaWarnAppDelegate, Re
 
 	private func applyEndOfLifeChanges() {
 		// Clear ddc Wallet cache
-		healthCertificateService.healthCertifiedPersons.forEach { healthCertifiedPerson in
-			healthCertifiedPerson.dccWalletInfo = nil
+		healthCertificateService.healthCertifiedPersons.forEach {
+			$0.dccWalletInfo = nil
+			$0.healthCertificates = $0.healthCertificates.filter {
+				$0.testEntry == nil
+			}
 		}
 		
 		// Clear all notifications including deadman notification