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 9902af731..e24ffa126 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,6 +342,13 @@ class EditHabitActivity : AppCompatActivity() {
                 isValid = false
             }
         }
+        if (isSkipDays && 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
+            }
+        }
         return isValid
     }
 
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 2af199da9..069072209 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -220,6 +220,7 @@
     <string name="measurable_units_example">e.g. miles</string>
     <string name="every_month">Every month</string>
     <string name="validation_cannot_be_blank">Cannot be blank</string>
+    <string name="validation_too_many_skips">Too many days selected</string>
     <string name="today">Today</string>
     <string name="enter">Enter</string>
     <string name="no_habits">No habits found</string>
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
index abdc00ec1..03e335f6d 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/WeekdayList.kt
@@ -34,8 +34,12 @@ class WeekdayList {
         }
     }
 
-    constructor(weekdays: BooleanArray) {
-        this.weekdays = Arrays.copyOf(weekdays, 7)
+    constructor(weekdays: BooleanArray?) {
+        this.weekdays = if (weekdays == null) {
+            BooleanArray(7)
+        } else {
+            Arrays.copyOf(weekdays, 7)
+        }
     }
 
     constructor(days: BooleanArray, removeDays: BooleanArray) {