diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
index 49dc05c9c62752b2f15d3bd314f971045348b9c2..f99851e7b28f6d8ea18481acdde8f7f5cee9dc32 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
@@ -14,8 +14,8 @@ data class OTPAuthorizationResult(
     @SerializedName("redeemedAt")
     val redeemedAt: Instant,
     @SerializedName("invalidated")
-    val invalidated: Boolean
+    val invalidated: Boolean = false
 ) {
 
-    fun toInvalidatedInstance() = OTPAuthorizationResult(uuid, authorized, redeemedAt, true)
+    fun toInvalidatedInstance() = copy(invalidated = true)
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
index 1210252617c853a799da456b87fa08a5c997cac3..8b52f3e8c498246c1fe4afdc92d26a4dae4d18dc 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
@@ -93,8 +93,7 @@ class Surveys @Inject constructor(
         val result = OTPAuthorizationResult(
             uuid = oneTimePassword.uuid,
             authorized = errorCode == null,
-            redeemedAt = now,
-            invalidated = false
+            redeemedAt = now
         )
         oneTimePasswordRepo.otpAuthorizationResult = result
 
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
index b9908423a1f9fccc6be8555b2971c8255fe03120..63d916e3d870042c220ad1c6cfe0e38ee34f58c1 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
@@ -69,8 +69,7 @@ class OTPRepositoryTest : BaseTest() {
         settings.otpAuthorizationResult = OTPAuthorizationResult(
             UUID.randomUUID(),
             true,
-            Instant.now(),
-            false
+            Instant.now()
         )
 
         settings.otpAuthorizationResult shouldNotBe null
@@ -88,8 +87,7 @@ class OTPRepositoryTest : BaseTest() {
         OTPRepository(settings).otpAuthorizationResult = OTPAuthorizationResult(
             UUID.randomUUID(),
             true,
-            Instant.now(),
-            false
+            Instant.now()
         )
         settings.oneTimePassword shouldBe null
     }