diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
index 086e9628888fab7c36afc2e48f7c4ddc29272fb2..8a5d733cb1be611c57e6d695c6609ade158d1ee4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
@@ -93,8 +93,10 @@ class RiskLevelTask @Inject constructor(
 
         if (!configData.isDeviceTimeCorrect) {
             Timber.w("Device time is incorrect, offset: %s", configData.localOffset)
+            val currentServerTime = nowUTC.minus(configData.localOffset)
+            Timber.d("Calculated current server time: %s", currentServerTime)
             return EwRiskLevelTaskResult(
-                calculatedAt = nowUTC,
+                calculatedAt = currentServerTime,
                 failureReason = FailureReason.INCORRECT_DEVICE_TIME
             )
         }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelTaskTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelTaskTest.kt
index 728fc06a90136da5a77f5ee56301572db7f38f96..3ef4940519c8bdbd235a2cc7031ab9e40175f360 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelTaskTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelTaskTest.kt
@@ -137,8 +137,10 @@ class RiskLevelTaskTest : BaseTest() {
         every { configData.isDeviceTimeCorrect } returns false
         every { configData.localOffset } returns Duration.standardHours(5)
 
+        val serverTime = testTimeNow.minus(configData.localOffset)
+
         createTask().run(arguments) shouldBe EwRiskLevelTaskResult(
-            calculatedAt = testTimeNow,
+            calculatedAt = serverTime,
             failureReason = EwRiskLevelResult.FailureReason.INCORRECT_DEVICE_TIME
         )
     }