diff --git a/search_api.install b/search_api.install
index 09e8bb5..4d2d528 100644
--- a/search_api.install
+++ b/search_api.install
@@ -333,6 +333,11 @@ function search_api_disable() {
 function search_api_uninstall() {
   variable_del('search_api_tasks');
   variable_del('search_api_index_worker_callback_runtime');
+
+  // As a precaution, remove any queued index runs that may have gotten stuck in the database
+  db_delete('queue')
+    ->condition('name', "search_api_indexing_queue")
+    ->execute();
 }
 
 /**