diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js
index 6f34f71ce..02eb1bea4 100644
--- a/Server/controllers/authController.js
+++ b/Server/controllers/authController.js
@@ -439,7 +439,9 @@ const deleteUserController = async (req, res, next) => {
     const decodedToken = jwt.decode(token);
     const { _id, email } = decodedToken;
 
+    // TODO fix this hack
     const decodedTokenCastedAsRequest = {
+      query: {},
       params: {
         userId: _id,
       },
@@ -480,6 +482,7 @@ const deleteUserController = async (req, res, next) => {
           await req.jobQueue.deleteJob(monitor);
           await req.db.deleteChecks(monitor._id);
           await req.db.deleteAlertByMonitorId(monitor._id);
+          await req.db.deletePageSpeedChecksByMonitorId(monitor._id);
           await req.db.deleteNotificationsByMonitorId(monitor._id);
         })
       );
diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js
index e05ed0389..d45b300f8 100644
--- a/Server/controllers/monitorController.js
+++ b/Server/controllers/monitorController.js
@@ -182,6 +182,7 @@ const deleteMonitor = async (req, res, next) => {
     await req.jobQueue.deleteJob(monitor);
     await req.db.deleteChecks(monitor._id);
     await req.db.deleteAlertByMonitorId(monitor._id);
+    await req.db.deletePageSpeedChecksByMonitorId(monitor._id);
     await req.db.deleteNotificationsByMonitorId(monitor._id);
 
     /**
diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js
index 2813a3c00..68597a794 100644
--- a/Server/db/mongo/MongoDB.js
+++ b/Server/db/mongo/MongoDB.js
@@ -79,7 +79,7 @@ const {
 const {
   createPageSpeedCheck,
   getPageSpeedChecks,
-  deletePageSpeedChecks,
+  deletePageSpeedChecksByMonitorId,
 } = require("./modules/pageSpeedCheckModule");
 
 //****************************************
@@ -157,7 +157,7 @@ module.exports = {
   deleteMonitorsByUserId,
   createPageSpeedCheck,
   getPageSpeedChecks,
-  deletePageSpeedChecks,
+  deletePageSpeedChecksByMonitorId,
   createMaintenanceWindow,
   getMaintenanceWindowsByUserId,
   getMaintenanceWindowsByMonitorId,
diff --git a/Server/db/mongo/modules/pageSpeedCheckModule.js b/Server/db/mongo/modules/pageSpeedCheckModule.js
index 65376a324..92f87d060 100644
--- a/Server/db/mongo/modules/pageSpeedCheckModule.js
+++ b/Server/db/mongo/modules/pageSpeedCheckModule.js
@@ -48,7 +48,7 @@ const getPageSpeedChecks = async (monitorId) => {
  * @throws {Error}
  */
 
-const deletePageSpeedChecks = async (monitorId) => {
+const deletePageSpeedChecksByMonitorId = async (monitorId) => {
   try {
     const result = await PageSpeedCheck.deleteMany({ monitorId });
     return result.deletedCount;
@@ -60,5 +60,5 @@ const deletePageSpeedChecks = async (monitorId) => {
 module.exports = {
   createPageSpeedCheck,
   getPageSpeedChecks,
-  deletePageSpeedChecks,
+  deletePageSpeedChecksByMonitorId,
 };