diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index 092bd8f8..1347d7f4 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -10,6 +10,7 @@ import net.pokeranalytics.android.model.filter.filter
 import net.pokeranalytics.android.model.filter.name
 import net.pokeranalytics.android.model.realm.ComputableResult
 import net.pokeranalytics.android.model.realm.SessionSet
+import net.pokeranalytics.android.model.upToNow
 import net.pokeranalytics.android.util.extensions.startOfDay
 import timber.log.Timber
 import java.util.*
@@ -139,7 +140,7 @@ class Calculator {
 
 			val computableGroups: MutableList<ComputableGroup> = mutableListOf()
 
-			criteria.combined().forEach { comparatorConditions ->
+			criteria.combined().upToNow().forEach { comparatorConditions ->
 
 				val allConditions = mutableListOf<QueryCondition>()
 				allConditions.addAll(conditions)