diff --git a/framework/base/Module.php b/framework/base/Module.php
index 9e8947b576..53348d5d9c 100644
--- a/framework/base/Module.php
+++ b/framework/base/Module.php
@@ -160,7 +160,7 @@ class Module extends ServiceLocator
     public static function setInstance($instance)
     {
         if ($instance === null) {
-            unset(self::$_instances[get_class()]);
+            unset(self::$_instances[get_called_class()]);
         } else {
             self::$_instances[get_class($instance)] = $instance;
         }