diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 5a13100bb..e0c1b6099 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -32,13 +32,15 @@ const isStaticTheme = (renderer, themeName)=>{
 // };
 
 const migrateSystemsToTags = (brew) => {
-	if(!brew?.systems?.length) return brew;
-
+	if (!('systems' in brew)) return brew;
+	if (!Array.isArray(brew.systems) || brew.systems.length === 0) {
+		brew.systems = undefined;
+		return brew;
+	}
 	const systemTags = brew.systems.map(s => `system:${s}`);
 	brew.tags = _.uniq([...(brew.tags || []), ...systemTags]);
 
-	delete brew.systems;
-
+	brew.systems = undefined;
 	return brew;
 };
 
@@ -405,8 +407,6 @@ const api = {
 		let brew         = _.assign(brewFromServer, brewFromClient);
 
 		migrateSystemsToTags(brew);
-		console.log('migrating systems to tags', !!brew.systems);
-		console.log(brew);
 
 		brew.title       = brew.title.trim();
 		brew.description = brew.description.trim() || '';
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index ff371ee42..b3d7702ce 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -15,7 +15,7 @@ const HomebrewSchema = mongoose.Schema({
 
 	description    : { type: String, default: '' },
 	tags           : { type: [String], index: true },
-	systems        : [String],
+	systems		   : { type: [String], default: undefined },
 	lang           : { type: String, default: 'en', index: true },
 	renderer       : { type: String, default: '', index: true },
 	authors        : { type: [String], index: true },