diff --git a/classes/Gems/Tracker/Respondent.php b/classes/Gems/Tracker/Respondent.php
index <HASH>..<HASH> 100644
--- a/classes/Gems/Tracker/Respondent.php
+++ b/classes/Gems/Tracker/Respondent.php
@@ -508,7 +508,11 @@ class Gems_Tracker_Respondent extends \Gems_Registry_TargetAbstract
                         $respTrack->setReceptionCode($newCode, null, $this->currentUser->getUserId());
                         $respTrack->restoreTokens($oldCode, $newCode);
                         $count++;
-                    }
+                    } else {
+                        // If the code was not assigned to the track, still try to restore tokens
+                        $tmpCount = $respTrack->restoreTokens($oldCode, $newCode);
+                        $count = $count + min($tmpCount, 1);
+		    }
                 }
             }
         }
@@ -541,4 +545,4 @@ class Gems_Tracker_Respondent extends \Gems_Registry_TargetAbstract
                 $this->getReceptionCode()
                 );
     }
-}
\ No newline at end of file
+}
Restore tokens with same code when restioring a respondent

When the respondent code was not assigned to a track, the tokens for that track were not restored when restoring the respondent.