diff --git a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt
index cd1e1c6bb2..033afba617 100644
--- a/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt
+++ b/infra/auth-logic/src/main/java/com/simprints/infra/authlogic/authenticator/SignerManager.kt
@@ -50,8 +50,6 @@ internal class SignerManager @Inject constructor(
     }
 
     suspend fun signOut() = withContext(dispatcher) {
-        authStore.cleanCredentials()
-        authStore.clearFirebaseToken()
 
         simNetwork.resetApiBaseUrl()
         configRepository.clearData()
@@ -62,6 +60,9 @@ internal class SignerManager @Inject constructor(
         enrolmentRecordRepository.deleteAll()
         scannerManager.deleteFirmwareFiles()
 
+        authStore.cleanCredentials()
+        authStore.clearFirebaseToken()
+
         Simber.tag(LoggingConstants.CrashReportTag.LOGOUT.name).i("Signed out")
     }