diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b4e1785..60a92754 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
 
     <application
+        android:name=".HermesControlApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/m57/hermescontrol/HermesControlApp.kt b/app/src/main/java/com/m57/hermescontrol/HermesControlApp.kt
new file mode 100644
index 00000000..69cb7cf7
--- /dev/null
+++ b/app/src/main/java/com/m57/hermescontrol/HermesControlApp.kt
@@ -0,0 +1,11 @@
+package com.m57.hermescontrol
+
+import android.app.Application
+import com.m57.hermescontrol.data.local.AuthManager
+
+class HermesControlApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        AuthManager.init(this)
+    }
+}
diff --git a/app/src/main/java/com/m57/hermescontrol/MainActivity.kt b/app/src/main/java/com/m57/hermescontrol/MainActivity.kt
index 8b2bba08..bcba7d1f 100644
--- a/app/src/main/java/com/m57/hermescontrol/MainActivity.kt
+++ b/app/src/main/java/com/m57/hermescontrol/MainActivity.kt
@@ -16,8 +16,6 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        AuthManager.init(this)
-
         // Read notification tap sessionId (if any) from the intent that launched us
         val notificationSessionId = intent?.getStringExtra(NotificationReplyReceiver.EXTRA_SESSION_ID)