diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index e24ffa126..78533aa45 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -342,8 +342,15 @@ class EditHabitActivity : AppCompatActivity() {
                 isValid = false
             }
         }
-        if (isSkipDays && freqDen == 7) {
-            if (7 - listSkipDays.numDays() < freqNum) {
+        if (isSkipDays) {
+            if (habitType == HabitType.YES_NO && freqDen == 7) {
+                if (7 - listSkipDays.numDays() < freqNum) {
+                    binding.skipDaysPicker.text = getString(R.string.validation_too_many_skips)
+                    binding.skipDaysPicker.error = getFormattedValidationError(R.string.validation_too_many_skips)
+                    isValid = false
+                }
+            }
+            if (listSkipDays.numDays() == 7) {
                 binding.skipDaysPicker.text = getString(R.string.validation_too_many_skips)
                 binding.skipDaysPicker.error = getFormattedValidationError(R.string.validation_too_many_skips)
                 isValid = false