diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index ac562212d..57ff01629 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -144,10 +144,12 @@ class TaskRepositoryImpl(
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
                     bgTask.completed = up
-                    if (TaskType.DAILY == bgTask.type && up) {
-                        bgTask.streak = (bgTask.streak ?: 0) + 1
-                    } else if(TaskType.DAILY == bgTask.type && !up && (bgTask.streak != null && bgTask.streak!! >= 1)){
-                        bgTask.streak = bgTask.streak!! - 1
+                    if(TaskType.DAILY == bgTask.type){
+                        if(up){
+                            bgTask.streak = (bgTask.streak ?: 0) + 1
+                        } else {
+                            bgTask.streak = (bgTask.streak ?: 0) - 1
+                        }
                     }
                 } else if (TaskType.HABIT == bgTask.type) {
                     if (up) {