diff --git a/scripts/server/database.js b/scripts/server/database.js
index addc10cd..28ab48ac 100644
--- a/scripts/server/database.js
+++ b/scripts/server/database.js
@@ -207,12 +207,16 @@ function createDatabaseInsertQuery(tableName, data) {
 	let values = [];
 
 	for(let i in data) {
-		fields.push(data[i][0]);
+		if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][0] != 'NaN') {
+			if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') {
+				fields.push(data[i][0]);
 
-		if(typeof data[i][1] == "string") {
-			values.push(`'${data[i][1]}'`);
-		} else {
-			values.push(data[i][1]);
+				if(typeof data[i][1] == "string") {
+					values.push(`'${data[i][1]}'`);
+				} else {
+					values.push(data[i][1]);
+				}
+			}
 		}
 	}
 
@@ -226,10 +230,14 @@ function createDatabaseUpdateQuery(tableName, data, whereClause) {
 	let values = [];
 
 	for(let i in data) {
-		if(typeof data[i][1] == "string") {
-			values.push(`${data[i][0]}='${data[i][1]}'`);
-		} else {
-			values.push(`${data[i][0]}=${data[i][1]}`);
+		if(data[i][0] != "undefined" && data[i][0] != NaN && data[i][0] != 'NaN') {
+			if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') {
+				if(typeof data[i][1] == "string") {
+					values.push(`${data[i][0]}='${data[i][1]}'`);
+				} else {
+					values.push(`${data[i][0]}=${data[i][1]}`);
+				}
+			}
 		}
 	}