diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts
index 3a5ba0ea04..ddfd5f2bba 100644
--- a/src/server/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -4,19 +4,21 @@ import config from '../../../config';
 import { ILocalUser } from '../../../models/user';
 
 export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
-	const expires = 1000 * 60 * 60 * 24 * 365; // One Year
-	ctx.cookies.set('i', user.token, {
-		path: '/',
-		domain: config.hostname,
-		// SEE: https://github.com/koajs/koa/issues/974
-		// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
-		secure: config.url.startsWith('https'),
-		httpOnly: false,
-		expires: new Date(Date.now() + expires),
-		maxAge: expires
-	});
-
 	if (redirect) {
+		//#region Cookie
+		const expires = 1000 * 60 * 60 * 24 * 365; // One Year
+		ctx.cookies.set('i', user.token, {
+			path: '/',
+			domain: config.hostname,
+			// SEE: https://github.com/koajs/koa/issues/974
+			// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
+			secure: config.url.startsWith('https'),
+			httpOnly: false,
+			expires: new Date(Date.now() + expires),
+			maxAge: expires
+		});
+		//#endregion
+
 		ctx.redirect(config.url);
 	} else {
 		ctx.status = 204;