diff --git a/src/lib/Organizer.cpp b/src/lib/Organizer.cpp
index d5bb137..319a94c 100755
--- a/src/lib/Organizer.cpp
+++ b/src/lib/Organizer.cpp
@@ -46,7 +46,7 @@ EventManager::event_added Organizer::addEvent(const string& data) {
             delete queueThread;
         }
 
-        queueThread = new boost::thread(boost::bind(&Organizer::processEventQueue, this));
+        queueThread = new std::thread(&Organizer::processEventQueue, this);
     }
 
     return result;
@@ -85,7 +85,7 @@ void Organizer::processEventQueue() {
         }
 
         /* Sleep thread to let events queue up */
-        boost::this_thread::sleep(boost::posix_time::milliseconds(THREAD_SLEEP_DELAY));
+        std::this_thread::sleep_for(std::chrono::milliseconds(THREAD_SLEEP_DELAY));
 
     } while (!em.isEmpty());
 
diff --git a/src/lib/Organizer.hpp b/src/lib/Organizer.hpp
index 67586ce..63b2c0d 100644
--- a/src/lib/Organizer.hpp
+++ b/src/lib/Organizer.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <boost/thread.hpp>
+#include <mutex>
+#include <thread>
+
 #include "EventManager.hpp"
 
 #define THREAD_SLEEP_DELAY 500
@@ -37,8 +39,8 @@ class Organizer {
   config_t settings;
   bool thread_running;
   EventManager em;
-  boost::mutex event_mtx;
-  boost::thread *queueThread;
+  std::mutex event_mtx;
+  std::thread *queueThread;
 
   void processEventQueue();
 };