diff --git a/src/Artemis.Core/Plugins/PluginFeature.cs b/src/Artemis.Core/Plugins/PluginFeature.cs
index 1eadf61aa..f2fb01fad 100644
--- a/src/Artemis.Core/Plugins/PluginFeature.cs
+++ b/src/Artemis.Core/Plugins/PluginFeature.cs
@@ -73,10 +73,10 @@ namespace Artemis.Core
 
                 if (!enable)
                 {
-                    IsEnabled = false;
-
                     // Even if disable failed, still leave it in a disabled state to avoid more issues
                     InternalDisable();
+                    IsEnabled = false;
+
                     OnDisabled();
                     return;
                 }
@@ -146,7 +146,7 @@ namespace Artemis.Core
         {
             if (disposing)
             {
-                Disable();
+                InternalDisable();
             }
         }