diff --git a/producer/event_monitor_producer/src/main_eventmon.cpp b/producer/event_monitor_producer/src/main_eventmon.cpp
index 313526b8e5c840ce7040b5729a02c6880495e732..26064f3094294539b7bf5e7907ef7b816d479a65 100644
--- a/producer/event_monitor_producer/src/main_eventmon.cpp
+++ b/producer/event_monitor_producer/src/main_eventmon.cpp
@@ -126,7 +126,7 @@ int main (int argc, char* argv[]) {
     uint64_t i = 0;
     while (true) {
         asapo::MessageHeader message_header;
-        auto err = event_detector->GetNextEvent(&message_header);
+        err = event_detector->GetNextEvent(&message_header);
         if (stop_signal) {
             break; // we check it here because signal can interrupt system call (ready by inotify and result in incomplete event data)
         }
@@ -136,7 +136,8 @@ int main (int argc, char* argv[]) {
             }
             continue;
         }
-        message_header.message_id = i++;
+        i = i + 1;
+        message_header.message_id = i;
         HandleDatasets(&message_header);
         producer->SendFile(message_header, GetEventMonConfig()->root_monitored_folder + asapo::kPathSeparator +
                            message_header.file_name, asapo::kDefaultIngestMode, "default", ProcessAfterSend);