diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index f42a90c8d..c957e7b72 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -137,7 +137,10 @@ bool TF2::get (const std::string& uuid, Task& task)
 ////////////////////////////////////////////////////////////////////////////////
 void TF2::add_task (Task& task)
 {
+  bool enabled = context.hooks.enable (false);
   context.hooks.onAdd (task);
+  context.hooks.enable (enabled);
+
   _tasks.push_back (task);           // For subsequent queries
   _added_tasks.push_back (task);     // For commit/synch
 
@@ -167,7 +170,10 @@ bool TF2::modify_task (const Task& task)
     if (i->get ("uuid") == uuid)
     {
       Task hookTask (task);
+
+      bool enabled = context.hooks.enable (false);
       context.hooks.onModify (*i, hookTask);
+      context.hooks.enable (enabled);
 
       *i = hookTask;
       _modified_tasks.push_back (hookTask);