diff --git a/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java b/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
index dadff87ae..afc8d6ff7 100644
--- a/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
+++ b/app/src/main/java/org/isoron/uhabits/models/HabitMatcher.java
@@ -76,8 +76,12 @@ public class HabitMatcher
         if (!isArchivedAllowed() && habit.isArchived()) return false;
         if (isReminderRequired() && !habit.hasReminder()) return false;
 
-        int todayCheckmark = habit.getCheckmarks().getTodayValue();
-        if (todayCheckmark != UNCHECKED && !isCompletedAllowed()) return false;
+        if(!isCompletedAllowed())
+        {
+            int todayCheckmark = habit.getCheckmarks().getTodayValue();
+            if (todayCheckmark != UNCHECKED) return false;
+        }
+
         if(!allowedColors.contains(habit.getColor())) return false;
         return true;
     }