diff --git a/src/providers/base_provider.cpp b/src/providers/base_provider.cpp
index fab317c5..4a92fa11 100644
--- a/src/providers/base_provider.cpp
+++ b/src/providers/base_provider.cpp
@@ -480,7 +480,6 @@ auto base_provider::set_item_meta(const std::string &api_path,
 
 auto base_provider::start(api_item_added_callback api_item_added,
                           i_file_manager *mgr) -> bool {
-  event_system::instance().raise<service_started>("sia_provider");
   utils::db::create_rocksdb(config_, DB_NAME, db_);
 
   api_item_added_ = api_item_added;
@@ -521,9 +520,7 @@ auto base_provider::start(api_item_added_callback api_item_added,
 }
 
 void base_provider::stop() {
-  event_system::instance().raise<service_shutdown_begin>("sia_provider");
   polling::instance().remove_callback("check_deleted");
   db_.reset();
-  event_system::instance().raise<service_shutdown_end>("sia_provider");
 }
 } // namespace repertory
diff --git a/src/providers/sia/sia_provider.cpp b/src/providers/sia/sia_provider.cpp
index 980ad4e6..a5df4ad1 100644
--- a/src/providers/sia/sia_provider.cpp
+++ b/src/providers/sia/sia_provider.cpp
@@ -802,7 +802,11 @@ auto sia_provider::start(api_item_added_callback api_item_added,
   return base_provider::start(api_item_added, mgr);
 }
 
-void sia_provider::stop() { return base_provider::stop(); }
+void sia_provider::stop() {
+  event_system::instance().raise<service_shutdown_begin>("sia_provider");
+  base_provider::stop();
+  event_system::instance().raise<service_shutdown_end>("sia_provider");
+}
 
 auto sia_provider::upload_file(const std::string &api_path,
                                const std::string &source_path,