diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 96d6aa5e999f8819c98d5beb9608bae81dc0eb29..6f07eb0b87366c355136f30aff5ac374bbee98ea 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -87,7 +87,6 @@ ManagerImpl::ManagerImpl() :
 ManagerImpl::~ManagerImpl()
 {
     delete imModule_;
-    delete history_;
     delete audiofile_;
 }
 
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index b1ff382644a927e9629bff665018bae6984432b4..5ba79afd4dab765400706619d0af8e5b4a3e8b53 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -1150,7 +1150,7 @@ class ManagerImpl {
           * To handle the persistent history
           * TODO: move this to ConfigurationManager
           */
-        History *history_;
+        std::auto_ptr<History> history_;
 
         /**
          * Instant messaging module, resposible to initiate, format, parse,