diff --git a/modules/authcache_form/authcache_form.module b/modules/authcache_form/authcache_form.module
index 930b99f..263827d 100644
--- a/modules/authcache_form/authcache_form.module
+++ b/modules/authcache_form/authcache_form.module
@@ -91,13 +91,8 @@ function authcache_form_cacheobject_presave($object, $cid, $bin) {
     //
     // @see
     // https://www.drupal.org/SA-CORE-2014-002
-    if (!empty($object->data['#cache_token'])) {
-      $object->data['#authcache_immutable'] = TRUE;
-      unset($object->data['#cache_token']);
-    }
-    else {
-      unset($object->data['#authcache_immutable']);
-    }
+    $object->data['#authcache_immutable'] = TRUE;
+    unset($object->data['#cache_token']);
 
     // Extend the expiry period for cached forms.
     $object->expire = REQUEST_TIME + authcache_form_cache_lifespan();