diff --git a/pathauto.module b/pathauto.module
--- pathauto.module
+++ pathauto.module
@@ -279,6 +279,16 @@
           module_load_include('inc', 'pathauto');
           $pathauto_alias = pathauto_create_alias('node', 'return', "node/{$node->nid}", array('node' => $node), $node->nid, $node->type, $node->language);
           $node->pathauto_perform_alias = isset($node->path) && $node->path == $pathauto_alias;
+      
+          /**
+           * Flush stale token cache; it was tainted with the old node values
+           * by calling pathauto_create_alias().
+           * 
+           * FIXME: This is a band-aid solution until #369840 is properly addressed
+           *        with a solution that stores the state of the "Automatic alias"
+           *        checkbox to a database table.
+           */
+          token_get_values('global', NULL, TRUE);
         }
         else {
           // If this is a new node, enable the automatic alias.