diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 1147d3504..1fa92a84d 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -57,15 +57,19 @@ const getUsersBrewThemes = async (username, id)=>{
 		'textBin'
 	];
 
-	const brews = await HomebrewModel.getByUser(username, true, fields, { tags: { $in: ['theme', 'Theme'] }, editId: { $ne: id } }) //lean() converts results to JSObjects
-		.catch((error)=>{throw 'Can not find brews';});
-
 	const userThemes = {
 		Brew : {
 
 		}
 	};
 
+	if(!username || !id) {
+		return userThemes;
+	}
+
+	const brews = await HomebrewModel.getByUser(username, true, fields, { tags: { $in: ['theme', 'Theme'] }, editId: { $ne: id } }) //lean() converts results to JSObjects
+		.catch((error)=>{throw 'Can not find brews';});
+
 	for await (const brew of brews) {
 		const brewTheme = await HomebrewModel.get({ editId: brew.editId }, ['textBin']);
 		splitTextStyleAndMetadata(brewTheme);