diff --git a/server/database.js b/server/database.js
index 2f6c1c5fe..4cf1e3933 100644
--- a/server/database.js
+++ b/server/database.js
@@ -107,6 +107,7 @@ class Database {
         R.freeze(true);
         await R.autoloadModels("./server/model");
 
+        await R.exec("PRAGMA foreign_keys = ON");
         // Change to WAL
         await R.exec("PRAGMA journal_mode = WAL");
         await R.exec("PRAGMA cache_size = -12000");
diff --git a/server/server.js b/server/server.js
index f5a8b16e3..ddd686951 100644
--- a/server/server.js
+++ b/server/server.js
@@ -638,6 +638,8 @@ exports.entryPage = "dashboard";
                 });
 
                 await sendMonitorList(socket);
+                // Clear heartbeat list on client
+                await sendImportantHeartbeatList(socket, monitorID, true, true);
 
             } catch (e) {
                 callback({