diff --git a/src/bufferActions.js b/src/bufferActions.js
index 3173ff7..3c793a4 100644
--- a/src/bufferActions.js
+++ b/src/bufferActions.js
@@ -13,12 +13,12 @@ export default function bufferActions(type = actionTypes.INIT) {
     if (!buffer) return next(action);
 
     if (action.type === type) {
-      buffer = false;
       next(action);
-      queue.forEach(queuedAction => {
-        next(queuedAction);
-      });
+      while (queue.length) {
+        next(queue.shift());
+      }
       queue = null;
+      buffer = false;
     } else {
       queue.push(action);
     }