diff --git a/server/api/index.js b/server/api/index.js
index befba44..41b44c1 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -90,29 +90,32 @@ export async function getHistory(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 = {
-    where: {},
+    where: {
+      substitution: {},
+    },
     include: {
       substitution: true,
     },
   };
   if (requestedClass) {
-    prismaOptions.where.class = { has: requestedClass };
+    prismaOptions.where.substitution.class = { has: requestedClass };
   }
   if (from && to) {
-    prismaOptions.where.substitution = {
-      date: {
-        gte: new Date(from),
-        lte: new Date(to),
-      },
+    prismaOptions.where.substitution.date = {
+      gte: new Date(from),
+      lte: new Date(to),
     };
+  } else if (date) {
+    prismaOptions.where.substitution.date = new Date(date);
   } else {
-    prismaOptions.where.substitution = { date: new Date(date) };
+    prismaOptions.where.substitution.date = {
+      gte: new Date(new Date().setUTCHours(0, 0, 0, 0)),
+    };
   }
 
   const rawChanges = await prisma.substitutionChange.findMany(prismaOptions);