diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift b/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift
index e1ea89d1..5dae8719 100644
--- a/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift
+++ b/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift
@@ -300,7 +300,6 @@ final class UserProfileViewModel: ObservableObject {
                         } else {
                             if roomId > 0 {
                                 AppState.shared.isShowPlayer = true
-                                AppState.shared.setAppStep(step: .main)
                             }
                         }
                     } else {
diff --git a/SodaLive/Sources/Live/LiveViewModel.swift b/SodaLive/Sources/Live/LiveViewModel.swift
index cb950eb2..fca06db5 100644
--- a/SodaLive/Sources/Live/LiveViewModel.swift
+++ b/SodaLive/Sources/Live/LiveViewModel.swift
@@ -144,7 +144,6 @@ final class LiveViewModel: ObservableObject {
                         } else {
                             if roomId > 0 {
                                 AppState.shared.isShowPlayer = true
-                                AppState.shared.setAppStep(step: .main)
                             }
                         }
                     } else {
diff --git a/SodaLive/Sources/Splash/SplashView.swift b/SodaLive/Sources/Splash/SplashView.swift
index 717a7c3f..312db065 100644
--- a/SodaLive/Sources/Splash/SplashView.swift
+++ b/SodaLive/Sources/Splash/SplashView.swift
@@ -116,7 +116,10 @@ struct SplashView: View {
 
                 if !UserDefaults.string(forKey: UserDefaultsKey.token).trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
                     if AppState.shared.pushRoomId > 0 {
-                        liveViewModel.enterLiveRoom(roomId: AppState.shared.pushRoomId)
+                        let roomId = AppState.shared.pushRoomId
+                        AppState.shared.pushRoomId = 0
+                        AppState.shared.setAppStep(step: .main)
+                        liveViewModel.enterLiveRoom(roomId: roomId)
                     } else if AppState.shared.pushChannelId > 0 {
                         AppState.shared.setAppStep(step: .creatorDetail(userId: AppState.shared.pushChannelId))
                     } else if AppState.shared.pushAudioContentId > 0 {