diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php
index 529fe5bbe..f26e13a44 100644
--- a/src/plugin/PluginManager.php
+++ b/src/plugin/PluginManager.php
@@ -435,10 +435,11 @@ class PluginManager{
 
 			$plugin->getScheduler()->setEnabled(true);
 			$plugin->onEnableStateChange(true);
+			if($plugin->isEnabled()){ //the plugin may have disabled itself during onEnable()
+				$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;
 
-			$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;
-
-			(new PluginEnableEvent($plugin))->call();
+				(new PluginEnableEvent($plugin))->call();
+			}
 		}
 	}