diff --git a/cps.module b/cps.module
index b39cc84..60d867b 100644
--- a/cps.module
+++ b/cps.module
@@ -2112,9 +2112,13 @@ function cps_move_changeset($changeset_from, $changeset_to, $entity_type, $entit
  *
  * @param bool $new_state
  *   The new state to set.
+ *
+ * @return bool
+ *   The old state that this function had before, or FALSE if the cache was
+ *   never previously disabled.
  */
 function cps_disable_entitycache($new_state = NULL) {
-  $state = &drupal_static(__FUNCTION__);
+  $state = &drupal_static(__FUNCTION__, FALSE);
 
   if (isset($new_state)) {
     $state = $new_state;
@@ -2131,8 +2135,9 @@ function cps_disable_entitycache($new_state = NULL) {
  * @param bool $new_state
  *   The new state to set.
  *
- * @return bool|NULL
- *   The old state that this function had before.
+ * @return bool
+ *   The old state that this function had before, or FALSE if the cache reset
+ *   functionality was never previously disabled.
  */
 function cps_disable_entitycache_reset($new_state = NULL) {
   $state = &drupal_static(__FUNCTION__, FALSE);