diff --git a/app/controllers/auth/Oauth2.controller.js b/app/controllers/auth/Oauth2.controller.js
index 3b85233..6f3a247 100644
--- a/app/controllers/auth/Oauth2.controller.js
+++ b/app/controllers/auth/Oauth2.controller.js
@@ -36,6 +36,12 @@ class Oauth2 extends Oauth2Controller {
             })
         }
 
+        if ( req.query.state ) {
+            const state = Array.isArray(req.query.state) ? req.query.state[0] : req.query.state
+            const uri_params = new URLSearchParams(uri.params)
+            uri_params.set('state', state)
+        }
+
         req.user.authorize(starship_client)
         await req.user.save()
         return super.authorize_post(req, res, next)