diff --git a/src/Server/Sandbox.php b/src/Server/Sandbox.php
index 5bf878e1..1fcad3bd 100644
--- a/src/Server/Sandbox.php
+++ b/src/Server/Sandbox.php
@@ -324,8 +324,8 @@ public function enable()
      */
     public function disable()
     {
-        Context::clear();
         $this->setInstance($this->getBaseApp());
+        Context::clear();
     }
 
     /**