diff --git a/Runtime/Enable/StateEnableMonoBehaviour.cs b/Runtime/Enable/StateEnableMonoBehaviour.cs
index 08d64b2..581923a 100644
--- a/Runtime/Enable/StateEnableMonoBehaviour.cs
+++ b/Runtime/Enable/StateEnableMonoBehaviour.cs
@@ -25,6 +25,12 @@ namespace Syntriax.Modules.State
             => OnEnabledChanged += (state) => enabled = state;
 
         protected void OnEnable() => IsEnabled = true;
-        protected void OnDisable() => IsEnabled = false;
+        protected void OnDisable()
+        {
+            IsEnabled = false;
+
+            if (!gameObject.activeInHierarchy) // Just so we can get OnEnable called when the object is back active again in the hierarchy  
+                this.enabled = true;
+        }
     }
 }
diff --git a/package.json b/package.json
index 4117416..a090907 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.syntriax.state",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "displayName": "State Module",
   "unity": "2019.1",
   "documentationUrl": "https://git.syntriax.com/Syntriax/State.git",