diff --git a/eventbus.cc b/eventbus.cc
index 866582db5..6df55830c 100644
--- a/eventbus.cc
+++ b/eventbus.cc
@@ -191,9 +191,6 @@ void event_bus::event_queue_dispatcher() {
 
         // Reset the lock
         event_cl.lock();
-      
-        // Unlock our hold on the system
-        lock.unlock();
 
         // Wait until new events
         event_cl.block_until();
diff --git a/kis_datasource.cc b/kis_datasource.cc
index ed3953ad4..558f013fd 100644
--- a/kis_datasource.cc
+++ b/kis_datasource.cc
@@ -837,6 +837,7 @@ void kis_datasource::handle_packet_probesource_report(uint32_t in_seqno,
 void kis_datasource::handle_packet_opensource_report(uint32_t in_seqno, 
         const std::string& in_content) {
     kis_unique_lock<kis_shared_mutex> lock(ext_mutex, std::defer_lock, "datasource handle_packet_opensource_report");
+    lock.lock();
 
     KismetDatasource::OpenSourceReport report;