diff --git a/plugins/state_history_plugin/state_history_plugin.cpp b/plugins/state_history_plugin/state_history_plugin.cpp
index 7f95debc38..8a65d7c0a8 100644
--- a/plugins/state_history_plugin/state_history_plugin.cpp
+++ b/plugins/state_history_plugin/state_history_plugin.cpp
@@ -387,6 +387,8 @@ void state_history_plugin_impl::plugin_shutdown() {
       app().executor().get_io_service().restart();
       while (app().executor().get_io_service().poll())
          ;
+      // clear priority queue of anything pushed by poll(), see application_base exec()
+      app().executor().clear();
    }
 }