diff --git a/server.cjs b/server.cjs
index 8472e1c..4a3ed8f 100644
--- a/server.cjs
+++ b/server.cjs
@@ -85,7 +85,7 @@ app.get("/trigger/api/messages", async (_req, res) => {
 app.get("/trigger/api/displayedGreeting", async (_req, res) => {
 	const conn = await pool.getConnection();
 	const query =
-		"SELECT * FROM trigger_database.messages ORDER BY RAND() LIMIT 1;";
+		"SELECT * FROM trigger_database.messages WHERE customGreeting = 1 ORDER BY RAND() LIMIT 1;";
 	conn.query(query).then((rows) => {
 		res.status(200).send(rows);
 	});
@@ -108,7 +108,7 @@ app.post("/trigger/api/messages", async (req, res) => {
 
 app.patch("/trigger/api/messages", async (req, res) => {
 	const conn = await pool.getConnection();
-	const query = `UPDATE trigger_database.messages SET message = ${escapeString(req.body.message)} WHERE id = ${req.body.id};`;
+	const query = `UPDATE trigger_database.messages SET message = ${escapeString(req.body.message)}, customGreeting = ${req.body.customGreeting} WHERE id = ${req.body.id};`;
 	conn
 		.query(query)
 		.then((_rows) => {