diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index 9ab09301b..e1eed42d2 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -189,7 +189,7 @@ const BrewRenderer = (props)=>{
 	}
 	let themePath     = props.theme ?? '5ePHB';
 	const Themes = { ...staticThemes, ...props.userThemes };
-	let baseThemePath = Themes[rendererPath][themePath]?.baseTheme;
+	let baseThemePath = (themePath && themePath[0] !== '#') ? Themes[rendererPath][themePath]?.baseTheme : 'Brew';
 
 	// Override static theme values if a Brew theme.
 
@@ -201,7 +201,6 @@ const BrewRenderer = (props)=>{
 	}
 
 	if(rendererPath == '') {
-		baseThemePath = 'Brew';
 		baseRendererPath = '';
 	} else {
 		baseRendererPath += '/';
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 61efa81c1..93dcd11c8 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -215,7 +215,8 @@ const MetadataEditor = createClass({
 		};
 
 		const currentThemePath = this.props.metadata?.theme && this.props.metadata.theme[0] === '#' ? 'Brew' : this.props.metadata.renderer;
-		const currentTheme = mergedThemes[`${_.upperFirst(currentThemePath)}`][this.props.metadata.theme];
+//		const currentTheme = mergedThemes[`${_.upperFirst(currentThemePath)}`][this.props.metadata.theme];
+		const currentTheme = mergedThemes[`${_.upperFirst(currentThemePath)}`].hasOwnProperty(this.props.metadata.theme) ? mergedThemes[`${_.upperFirst(currentThemePath)}`][this.props.metadata.theme] : { name: `!!! THEME MISSING !!! ID=${this.props.metadata.theme.slice(1)}`};
 		let dropdown;
 
 		if(this.props.metadata.renderer == 'legacy') {
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
index d9ff2ca1a..c21807343 100644
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -99,7 +99,7 @@ const PrintPage = createClass({
 		}
 		let themePath     = this.state.brew.theme ?? '5ePHB';
 		const Themes = { ...staticThemes, ...this.state.brew.userThemes };
-		let baseThemePath = Themes[rendererPath][themePath]?.baseTheme;
+		let baseThemePath = (themePath && themePath[0] !== '#') ? Themes[rendererPath][themePath]?.baseTheme : 'Brew';
 
 		// Override static theme values if a Brew theme.
 
diff --git a/server/app.js b/server/app.js
index e5b802c72..8a8b67b50 100644
--- a/server/app.js
+++ b/server/app.js
@@ -300,6 +300,7 @@ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
 		renderer : req.brew.renderer,
 		theme    : req.brew.theme,
 		tags     : req.brew.tags,
+		userThemes : req.brew.userThemes
 	};
 	req.brew = _.defaults(brew, DEFAULT_BREW);