diff --git a/src/framework/KafkaManager.cpp b/src/framework/KafkaManager.cpp
index 38cdcb1..c398368 100644
--- a/src/framework/KafkaManager.cpp
+++ b/src/framework/KafkaManager.cpp
@@ -123,6 +123,7 @@ namespace OpenWifi {
 			}
 			Note = Queue_.waitDequeueNotification();
 		}
+		Producer.flush();
 		poco_information(Logger_, "Stopped...");
 	}
 
@@ -328,4 +329,4 @@ namespace OpenWifi {
 											   partitions.front().get_partition()));
 	}
 
-} // namespace OpenWifi
\ No newline at end of file
+} // namespace OpenWifi