1 files changed, 3 insertions, 0 deletions
diff --git a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java b/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java
index 014a728d..5f21e052 100644
--- a/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java
+++ b/juick-server/src/main/java/com/juick/server/www/controllers/SocialLogin.java
@@ -111,6 +111,9 @@ public class SocialLogin {
                          HttpServletResponse response) throws IOException, ExecutionException, InterruptedException {
         if (StringUtils.isBlank(code)) {
             String fbstate = UUID.randomUUID().toString();
+            if (StringUtils.isBlank(state)) {
+                state = Utils.getPreviousPageByRequest(request).orElse("https://juick.com/");
+            }
             crosspostService.addFacebookState(fbstate, state);
             OAuth20Service facebookAuthService = facebookBuilder
                     .apiSecret(FACEBOOK_SECRET)