diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 732c06486..66dfd4d19 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -52,6 +52,7 @@ const Homebrew = createClass({
 						<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} query={queryString.parse(routeProps.location.search)}/>}/>
 						<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} />}/>
 						<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} />}/>
+						<Route path='/home' component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/changelog' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/faq' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/v3_preview' exact component={()=><HomePage brew={this.props.brew} />}/>
diff --git a/server/app.js b/server/app.js
index de51c8882..56b63235a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -109,9 +109,28 @@ app.get('/robots.txt', (req, res)=>{
 
 //Home page
 app.get('/', async (req, res, next)=>{
+	const homePageId = config.get('homePage');
+	if(homePageId){
+		return res.redirect('/home');
+	}
+	// const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
+
 	const brew = {
 		text : welcomeText
 	};
+
+	req.brew = brew;
+	return next();
+});
+
+app.get('/home', async (req, res, next)=>{
+	const homePageId = config.get('homePage');
+
+	const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
+	// const brew = {
+	// 	text : welcomeText
+	// };
+
 	req.brew = brew;
 	return next();
 });