diff --git a/src/backend/history.cc b/src/backend/history.cc
index f0a13f0..478f288 100644
--- a/src/backend/history.cc
+++ b/src/backend/history.cc
@@ -70,7 +70,12 @@ History::notify_change()
 bool
 History::set_notify_enabled(bool enabled)
 {
-  bool r = _notify;
+  bool old_value = _notify;
   _notify = enabled;
-  return r;
+  
+  // Force notify if we re-enable it
+  if(old_value == false && _notify == true)
+    notify_change();
+
+  return old_value;
 }