diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7da4e84..9305479d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.8.4
+  VERSION 3.8.5
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
diff --git a/src/Monitoring.cxx b/src/Monitoring.cxx
index aacaa757..b7524154 100644
--- a/src/Monitoring.cxx
+++ b/src/Monitoring.cxx
@@ -63,9 +63,9 @@ void Monitoring::flushBuffer()
     for (auto& backend : mBackends) {
       if (matchVerbosity(backend->getVerbosity(), static_cast<Verbosity>(verbosity))) {
         backend->send(std::move(buffer));
-        buffer.clear();
       }
     }
+    buffer.clear();
   }
 }
 
@@ -74,9 +74,9 @@ void Monitoring::flushBuffer(const short index)
   for (auto& backend : mBackends) {
     if (matchVerbosity(backend->getVerbosity(), static_cast<Verbosity>(index))) {
       backend->send(std::move(mStorage[index]));
-      mStorage[index].clear();
     }
   }
+  mStorage[index].clear();
 }
 
 void Monitoring::enableProcessMonitoring(const unsigned int interval)