diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx
index c89f6c95b..b8ee5634b 100644
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -23,15 +23,15 @@ const HomePage = createClass({
 	getDefaultProps : function() {
 		return {
 			brew : {
-				text        : '',
-				welcomeText : ''
+				text : '',
 			},
 			ver : '0.0.0'
 		};
 	},
 	getInitialState : function() {
 		return {
-			brew : this.props.brew
+			brew        : this.props.brew,
+			welcomeText : this.props.brew.text
 		};
 	},
 	handleSave : function(){
@@ -85,7 +85,7 @@ const HomePage = createClass({
 				</SplitPane>
 			</div>
 
-			<div className={cx('floatingSaveButton', { show: this.props.brew.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
+			<div className={cx('floatingSaveButton', { show: this.state.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
 				Save current <i className='fas fa-save' />
 			</div>
 
diff --git a/server.js b/server.js
index 88019de4b..648a08cd1 100644
--- a/server.js
+++ b/server.js
@@ -108,8 +108,7 @@ app.get('/robots.txt', (req, res)=>{
 //Home page
 app.get('/', async (req, res, next)=>{
 	const brew = {
-		text        : welcomeText,
-		welcomeText : welcomeText
+		text : welcomeText
 	};
 	req.brew = brew;
 	return next();