diff --git a/app/src/main/java/com/example/bondoman/views/activities/LoginActivity.kt b/app/src/main/java/com/example/bondoman/views/activities/LoginActivity.kt
index 75a502611950817f5691f5252ea7735836d1e1ee..c23a016018ff8a10515c279958be22902a1e7a56 100644
--- a/app/src/main/java/com/example/bondoman/views/activities/LoginActivity.kt
+++ b/app/src/main/java/com/example/bondoman/views/activities/LoginActivity.kt
@@ -13,14 +13,12 @@ import com.example.bondoman.data.utils.PreferencesManager
 import com.example.bondoman.data.viewmodels.login.LoginViewModel
 import com.example.bondoman.networks.responses.LoginResponse
 import com.example.bondoman.networks.responses.TokenResponse
-import com.example.bondoman.services.services.ExpiryService
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputEditText
 
 class LoginActivity : AppCompatActivity() {
 	private val viewModel: LoginViewModel by viewModels()
-	private val expiryDuration: Long = 300000L // 5 minutes
-// 	private val expiryDuration: Long = 10000L // 10 seconds for testing
+	// 	private val expiryDuration: Long = 10000L // 10 seconds for testing
 
 	private lateinit var loginLayout: ConstraintLayout
 	private lateinit var emailInput: TextInputEditText
@@ -84,8 +82,6 @@ class LoginActivity : AppCompatActivity() {
 				if (response.error != null) {
 					Toast.makeText(this, response.error, Toast.LENGTH_SHORT).show()
 				} else {
-					startTimerService(expiryDuration)
-
 					val nim = email.substringBefore("@")
 
 					PreferencesManager.putString(this, "token", response.token ?: "", true)
@@ -136,8 +132,6 @@ class LoginActivity : AppCompatActivity() {
 					return@Observer
 				}
 
-				startTimerService(response.exp?.minus(currentTime) ?: expiryDuration)
-
 				val intent = Intent(this, MainActivity::class.java)
 				startActivity(intent)
 				finish()
@@ -147,13 +141,4 @@ class LoginActivity : AppCompatActivity() {
 
 		viewModel.tokenResponse.observe(this, observer)
 	}
-
-	private fun startTimerService(duration: Long) {
-		val serviceIntent =
-			Intent(this, ExpiryService::class.java).apply {
-				putExtra("timeout_duration", duration)
-			}
-		stopService(serviceIntent)
-		startService(serviceIntent)
-	}
 }
diff --git a/app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt b/app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt
index 8da512e4a28cf20f34c88f5ac6ff09f69a1dfd52..daccd2f2ab857a915a8bc6098922652b52f7c718 100644
--- a/app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/bondoman/views/activities/MainActivity.kt
@@ -32,6 +32,7 @@ import com.example.bondoman.data.viewmodels.transaction.TransactionViewModel
 import com.example.bondoman.data.viewmodels.transaction.TransactionViewModelFactory
 import com.example.bondoman.databinding.ActivityMainBinding
 import com.example.bondoman.services.receivers.ExpiryBroadcastReceiver
+import com.example.bondoman.services.services.ExpiryService
 import com.example.bondoman.views.utils.interfaces.ParentActivityService
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import eightbitlab.com.blurview.BlurView
@@ -386,6 +387,18 @@ class MainActivity : AppCompatActivity(), ParentActivityService {
 		monitorConnection()
 	}
 
+	override fun onResume() {
+		super.onResume()
+
+		val serviceIntent =
+			Intent(this, ExpiryService::class.java).apply {
+				putExtra("timeout", 0)
+			}
+
+		stopService(serviceIntent)
+		startService(serviceIntent)
+	}
+
 	override fun onSaveInstanceState(outState: Bundle) {
 		super.onSaveInstanceState(outState)
 		outState.putBoolean("randomizeNextTransaction", randomizeNextTransaction)