diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 0aa86c705ca79d25a81a069714f500319cddca21..82f7d6f3b81fd95fc2db2b8e192a6bae5f196598 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -205,6 +205,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
      * Executes the TOKEN Transaction State
      */
     private suspend fun executeToken() = executeState(TOKEN) {
+        googleAPITokenForRollback.set(LocalData.googleApiToken())
         val tempToken = UUID.randomUUID().toString()
         LocalData.googleApiToken(tempToken)
         return@executeState tempToken
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
index 08915f8285a8c3d32343c66ff7171f44a0266008..e8c59395e8583acf1d6313379823f3b75d1edb94 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
@@ -19,6 +19,7 @@ import org.junit.Test
 import java.io.File
 import java.nio.file.Paths
 import java.util.Date
+import java.util.UUID
 
 /**
  * RetrieveDiagnosisKeysTransaction test.
@@ -44,6 +45,7 @@ class RetrieveDiagnosisKeysTransactionTest {
         every { LocalData.googleApiToken(any()) } just Runs
         every { LocalData.lastTimeDiagnosisKeysFromServerFetch() } returns Date()
         every { LocalData.lastTimeDiagnosisKeysFromServerFetch(any()) } just Runs
+        every { LocalData.googleApiToken() } returns UUID.randomUUID().toString()
     }
 
     @Test