diff --git a/webapp/stores/browser_store.jsx b/webapp/stores/browser_store.jsx
index bba146e384..d605aac807 100644
--- a/webapp/stores/browser_store.jsx
+++ b/webapp/stores/browser_store.jsx
@@ -8,7 +8,7 @@ function getPrefix() {
         return global.window.mm_current_user_id + '_';
     }
 
-    console.log('BrowserStore tried to operate without user present'); //eslint-disable-line no-console
+    console.warn('BrowserStore tried to operate without user present'); //eslint-disable-line no-console
 
     return 'unknown_';
 }
@@ -144,18 +144,14 @@ class BrowserStoreClass {
      * Signature for action is action(key, value)
      */
     actionOnGlobalItemsWithPrefix(prefix, action) {
-        var globalPrefix = getPrefix();
-        var globalPrefixiLen = globalPrefix.length;
-
         var storage = sessionStorage;
         if (this.isLocalStorageSupported()) {
             storage = localStorage;
         }
 
         for (var key in storage) {
-            if (key.lastIndexOf(globalPrefix + prefix, 0) === 0) {
-                var userkey = key.substring(globalPrefixiLen);
-                action(userkey, this.getGlobalItem(key));
+            if (key.lastIndexOf(prefix, 0) === 0) {
+                action(key, this.getGlobalItem(key));
             }
         }
     }
diff --git a/webapp/stores/post_store.jsx b/webapp/stores/post_store.jsx
index 757599b0fe..36393f5cd3 100644
--- a/webapp/stores/post_store.jsx
+++ b/webapp/stores/post_store.jsx
@@ -495,7 +495,7 @@ class PostStoreClass extends EventEmitter {
         BrowserStore.actionOnGlobalItemsWithPrefix('draft_', (key, value) => {
             if (value) {
                 value.uploadsInProgress = [];
-                BrowserStore.setItem(key, value);
+                BrowserStore.setGlobalItem(key, value);
             }
         });
     }
@@ -503,7 +503,7 @@ class PostStoreClass extends EventEmitter {
         BrowserStore.actionOnGlobalItemsWithPrefix('comment_draft_', (key, value) => {
             if (value) {
                 value.uploadsInProgress = [];
-                BrowserStore.setItem(key, value);
+                BrowserStore.setGlobalItem(key, value);
             }
         });
     }