diff --git a/src/Form/TfaLoginForm.php b/src/Form/TfaLoginForm.php
index a268a6b..2ed7cac 100644
--- a/src/Form/TfaLoginForm.php
+++ b/src/Form/TfaLoginForm.php
@@ -174,12 +174,14 @@ class TfaLoginForm extends UserLoginForm {
         // yet.
         // $this->begin($tfaValidationPlugin);
         $login_hash = $this->getLoginHash($account);
+        $destination = \Drupal::destination()->getAsArray();
+        \Drupal::request()->query->remove('destination');
         $form_state->setRedirect(
           'tfa.entry',
           [
             'user' => $account->id(),
             'hash' => $login_hash,
-          ]
+          ] + $destination
         );
       }
       else {