diff --git a/routes/admin.js b/routes/admin.js
index ff3e0b3..902b23e 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -111,6 +111,11 @@ router.post('/edit/:id', authenticate, async (req, res) => {
 	const robloxId = data.robloxId || null;
 	const discordId = data.discordId || null;
 
+	// if data.neverExpires == "on" then set expiresTimestamp to null
+	if (data.neverExpires == "on") {
+		expiresTimestamp = null;
+	}
+
 	await conn.query('UPDATE bans SET reasonShort = ?, reasonLong = ?, reasonsFlag = ?, moderator = ?, expiresTimestamp = ?, robloxId = ?, discordId = ? WHERE id = ?', 
 		[reasonShort, reasonLong, reasonsFlag, moderator, expiresTimestamp, robloxId, discordId, id]);
 	conn.end();