diff --git a/server/api/index.js b/server/api/index.js
index 5c7a3bd..befba44 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -36,9 +36,8 @@ export async function getSubstitutions(req, res) {
   if (req.query.from && req.query.to) {
     from = new Date(req.query.from).setUTCHours(0, 0, 0, 0);
     to = new Date(req.query.to).setUTCHours(0, 0, 0, 0);
-  } else {
-    date = new Date(req.query.date || new Date()).setUTCHours(0, 0, 0, 0);
-    console.log(date);
+  } else if (req.query.date) {
+    date = new Date(req.query.date).setUTCHours(0, 0, 0, 0);
   }
 
   const prismaOptions = {
@@ -57,8 +56,12 @@ export async function getSubstitutions(req, res) {
       gte: new Date(from),
       lte: new Date(to),
     };
-  } else {
+  } else if (date) {
     prismaOptions.where.date = new Date(date);
+  } else {
+    prismaOptions.where.date = {
+      gte: new Date(new Date().setUTCHours(0, 0, 0, 0)),
+    };
   }
 
   const rawSubstitutions = await prisma.substitution.findMany(prismaOptions);