diff --git a/client/homebrew/utils/versionHistory.js b/client/homebrew/utils/versionHistory.js
index ad952f74b..1faac8869 100644
--- a/client/homebrew/utils/versionHistory.js
+++ b/client/homebrew/utils/versionHistory.js
@@ -8,8 +8,8 @@ export const HISTORY_PREFIX = 'HOMEBREWERY-HISTORY'
 // 	5: 2 * 24 * 60  // 2 days
 // };
 
+// Test values
 const HISTORY_SAVE_DELAYS = {
-    // Test values
     0: 0,           // 0 minutes (if not specified)
 	1: 1,			// 1 minutes
 	2: 2,			// 2 minutes
@@ -18,7 +18,26 @@ const HISTORY_SAVE_DELAYS = {
 	5: 5            // 5 minutes
 };
 
-function updateStoredBrew(key, brew, slot=0){
+const DEFAULT_STORED_BREW = {
+    shareId  : 'default_brew',
+    expireAt : '2000-01-01T00:00:00.000Z'
+};
+
+function getKeyBySlot(brew, slot){
+    return `${HISTORY_PREFIX}-${brew.shareId}-${slot}`;
+};
+
+function getVersionBySlot(brew, slot){
+    // Read stored brew data
+    // - If it exists, parse data to object
+    // - If it doesn't exist, pass default object
+    const key = getKeyBySlot(brew, slot);
+    const storedVersion = localStorage.getItem(key);
+    const output = storedVersion ? JSON.parse(storedVersion) : { ...DEFAULT_STORED_BREW, ...brew };
+    return output;
+};
+
+function updateStoredBrew(brew, slot=0){
     const archiveBrew = {};
 
     // Data from brew to be stored
@@ -26,6 +45,7 @@ function updateStoredBrew(key, brew, slot=0){
     archiveBrew.text = brew.text;
     archiveBrew.style = brew.style;
     archiveBrew.version = brew.version;
+    archiveBrew.shareId = brew.shareId;
 
     // Calculated values
     archiveBrew.savedAt = new Date();
@@ -33,34 +53,37 @@ function updateStoredBrew(key, brew, slot=0){
     archiveBrew.expireAt.setMinutes(archiveBrew.expireAt.getMinutes() + HISTORY_SAVE_DELAYS[slot]);
     
     // Store data
+    const key = getKeyBySlot(brew, slot);
     localStorage.setItem(key, JSON.stringify(archiveBrew));
     return;
 };
 
 export function updateHistory(brew) {
     const numbers = [1,2,3,4,5];
-    const historyKeys = {};
+    const history = {};
+
+    // Load data from local storage to History object
     numbers.forEach((i)=>{
-        historyKeys[i] = `${HISTORY_PREFIX}-${brew.shareId}-${i}`;
+        history[i] = getVersionBySlot(brew, i);
     });
+
     numbers.toReversed().every((slot)=>{
-        const key = historyKeys[slot];
-        const storedVersion = localStorage.getItem(key);
-
-        // If no version stored at this key, update and break
-        if(!storedVersion){
-            console.log('Empty slot: ', slot);
-            updateStoredBrew(key, brew, slot);
-            return false;
-        }
-
-        // Parse slot data
-        const storedObject = JSON.parse(storedVersion);
+        const storedVersion = history[slot];
 
         // If slot has expired, update
-        if(new Date() >= new Date(storedObject.expireAt)){
+        if(new Date() >= new Date(storedVersion.expireAt)){
             console.log('Expired slot: ', slot);
-            updateStoredBrew(key, brew, slot);
+            const keys = Array.from(Array(slot - 1).keys());
+            keys.toReversed().every((n)=>{
+                const num = n + 1;
+                updateStoredBrew({ ...history[num], shareId: brew.shareId }, num + 1);
+                if(num == 1) {
+                    updateStoredBrew(brew, 1);
+                    return false;
+                }
+
+                return true;
+            });
             return false;
         }
         return true;