diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 55bdb8230..167d657d3 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -259,12 +259,14 @@ const EditPage = createClass({
 		const preSaveSnapshot = { ...this.state.brew };
 
 		//Prepare content to send to server
-		const brew     = { ...this.state.brew };
-		brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
-		brew.patches   = stringifyPatches(makePatches(this.savedBrew.text, brew.text));
-		brew.hash      = await md5(this.savedBrew.text.normalize());
-		brew.text      = undefined;
-		brew.textBin   = undefined;
+		const brew          = { ...this.state.brew };
+		brew.text           = brew.text.normalize();
+		this.savedBrew.text = this.savedBrew.text.normalize();
+		brew.pageCount      = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
+		brew.patches        = stringifyPatches(makePatches(this.savedBrew.text, brew.text));
+		brew.hash           = await md5(this.savedBrew.text.normalize());
+		brew.text           = undefined;
+		brew.textBin        = undefined;
 
 		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
 		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index df166d2c3..b5c59e7ef 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -339,9 +339,10 @@ const api = {
 		// Initialize brew from request and body, destructure query params, and set the initial value for the after-save method
 		const brewFromClient = api.excludePropsFromUpdate(req.body);
 		const brewFromServer = req.brew;
+		brewFromServer.text  = brewFromServer.text.normalize();
 		splitTextStyleAndMetadata(brewFromServer);
 
-		brewFromServer.hash  = await md5(brewFromServer.text.normalize());
+		brewFromServer.hash  = await md5(brewFromServer.text);
 
 		if((brewFromServer?.version !== brewFromClient?.version) || (brewFromServer?.hash !== brewFromClient?.hash)) {
 			if(brewFromClient?.version !== brewFromClient?.version)