diff --git a/core/modules/help_topics/help_topics.module b/core/modules/help_topics/help_topics.module
index 92e9c7c..9651d60 100644
--- a/core/modules/help_topics/help_topics.module
+++ b/core/modules/help_topics/help_topics.module
@@ -60,8 +60,10 @@ function help_topics_theme() {
  * Implements hook_modules_uninstalled().
  */
 function help_topics_modules_uninstalled(array $modules) {
-  // Early return if search is not installed.
-  if (!\Drupal::hasService('plugin.manager.search')) {
+  // Early return if search is not installed or if we're uninstalling this
+  // module.
+  if (!\Drupal::hasService('plugin.manager.search') ||
+    in_array('help_topics', $modules)) {
     return;
   }
   $search_plugin_manager = \Drupal::service('plugin.manager.search');