diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt
index 3a16317f..edc4cd95 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/user/login/LoginActivity.kt
@@ -434,8 +434,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(ActivityLoginBinding::i
     }
 
     private fun navigateToMain() {
-        finishAffinity()
-        val nextIntent = Intent(applicationContext, MainActivity::class.java)
+        val nextIntent = Intent(this@LoginActivity, MainActivity::class.java)
         val extras = intent.getBundleExtra(Constants.EXTRA_DATA)
             ?: if (intent.extras != null) {
                 intent.extras
@@ -445,8 +444,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(ActivityLoginBinding::i
         if (extras != null) {
             nextIntent.putExtra(Constants.EXTRA_DATA, extras)
         }
-        nextIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        nextIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        nextIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        nextIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
         startActivity(nextIntent)
+        finish()
     }
 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt
index 3736788a..a739238b 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/user/signup/SignUpActivity.kt
@@ -70,18 +70,7 @@ class SignUpActivity : BaseActivity<ActivitySignupBinding>(ActivitySignupBinding
             hideKeyboard()
             viewModel.signUp {
                 it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
-                finishAffinity()
-                val nextIntent = Intent(applicationContext, MainActivity::class.java)
-                val extras = intent.getBundleExtra(Constants.EXTRA_DATA)
-                    ?: if (intent.extras != null) {
-                        intent.extras
-                    } else {
-                        null
-                    }
-                if (extras != null) {
-                    nextIntent.putExtra(Constants.EXTRA_DATA, extras)
-                }
-                startActivity(nextIntent)
+                navigateToMain()
             }
         }
     }
@@ -161,4 +150,21 @@ class SignUpActivity : BaseActivity<ActivitySignupBinding>(ActivitySignupBinding
             null -> null
         }
     }
+
+    private fun navigateToMain() {
+        val nextIntent = Intent(this@SignUpActivity, MainActivity::class.java)
+        val extras = intent.getBundleExtra(Constants.EXTRA_DATA)
+            ?: if (intent.extras != null) {
+                intent.extras
+            } else {
+                null
+            }
+        if (extras != null) {
+            nextIntent.putExtra(Constants.EXTRA_DATA, extras)
+        }
+        nextIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        nextIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        startActivity(nextIntent)
+        finish()
+    }
 }