diff --git a/src/Yesod/Auth/OAuth2/Dispatch.hs b/src/Yesod/Auth/OAuth2/Dispatch.hs
index 162e9ff..49c32c6 100644
--- a/src/Yesod/Auth/OAuth2/Dispatch.hs
+++ b/src/Yesod/Auth/OAuth2/Dispatch.hs
@@ -81,8 +81,8 @@ dispatchCallback
     -> FetchCreds site
     -> m TypedContent
 dispatchCallback name oauth2 getToken getCreds = do
-    csrf <- verifySessionCSRF $ tokenSessionKey name
     onErrorResponse $ throwError . OAuth2HandshakeError
+    csrf <- verifySessionCSRF $ tokenSessionKey name
     code <- requireGetParam "code"
     manager <- authHttpManager
     oauth2' <- withCallbackAndState name oauth2 csrf