diff --git a/cps.module b/cps.module
index 60d867b..144b649 100644
--- a/cps.module
+++ b/cps.module
@@ -2121,7 +2121,10 @@ function cps_disable_entitycache($new_state = NULL) {
   $state = &drupal_static(__FUNCTION__, FALSE);
 
   if (isset($new_state)) {
+    $old_state = $state;
     $state = $new_state;
+
+    return $old_state;
   }
 
   return $state;