diff --git a/src/global/generation.js b/src/global/generation.js
index ee151c772..bce42d077 100644
--- a/src/global/generation.js
+++ b/src/global/generation.js
@@ -7,6 +7,8 @@ let generation = 1;
 // these counters are aimed to mitigate the "first render"
 let hotComparisonCounter = 0;
 let hotComparisonRuns = 0;
+let hotReplacementGeneration = 0;
+
 const nullFunction = () => ({});
 
 // these callbacks would be called on component update
@@ -24,7 +26,8 @@ export const setComparisonHooks = (open, element, close) => {
 export const getElementComparisonHook = component => onHotComparisonElement(component);
 export const getElementCloseHook = component => onHotComparisonClose(component);
 
-export const hotComparisonOpen = () => hotComparisonCounter > 0 && hotComparisonRuns > 0;
+export const hotComparisonOpen = () =>
+  hotComparisonCounter > 0 && hotComparisonRuns > 0 && hotReplacementGeneration > 0;
 
 const openGeneration = () => forEachKnownClass(onHotComparisonElement);
 
@@ -48,6 +51,7 @@ const decrementHot = () => {
 export const configureGeneration = (counter, runs) => {
   hotComparisonCounter = counter;
   hotComparisonRuns = runs;
+  hotReplacementGeneration = runs;
 };
 
 // TODO: shall it be called from incrementHotGeneration?
@@ -63,6 +67,5 @@ export const increment = () => {
 export const get = () => generation;
 
 // These counters tracks HMR generations, and probably should be used instead of the old one
-let hotReplacementGeneration = 0;
 export const incrementHotGeneration = () => hotReplacementGeneration++;
 export const getHotGeneration = () => hotReplacementGeneration;
diff --git a/src/utils/runQueue.js b/src/utils/runQueue.js
new file mode 100644
index 000000000..630e200e9
--- /dev/null
+++ b/src/utils/runQueue.js
@@ -0,0 +1,21 @@
+export const createQueue = (runner = a => a()) => {
+  let promise;
+  let queue = [];
+
+  const runAll = () => {
+    const oldQueue = queue;
+    oldQueue.forEach(cb => cb());
+    queue = [];
+  };
+
+  const add = cb => {
+    if (queue.length === 0) {
+      promise = Promise.resolve().then(() => runner(runAll()));
+    }
+    queue.push(cb);
+
+    return promise;
+  };
+
+  return add;
+};