diff --git a/android/app/build.gradle b/android/app/build.gradle
index bc5e419..6379aca 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     implementation 'io.github.dkaukov:esp32-flash-lib:1.1.17'
     implementation 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
     implementation 'org.slf4j:slf4j-nop:2.0.16'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
 }
\ No newline at end of file
diff --git a/android/app/src/main/java/com/eddy/atomrelay/MainActivity.kt b/android/app/src/main/java/com/eddy/atomrelay/MainActivity.kt
index b48c39f..f3576b7 100644
--- a/android/app/src/main/java/com/eddy/atomrelay/MainActivity.kt
+++ b/android/app/src/main/java/com/eddy/atomrelay/MainActivity.kt
@@ -164,8 +164,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun loadHmacKey() {
-        val prefs = getSharedPreferences(SettingsActivity.PREFS_NAME, Context.MODE_PRIVATE)
-        val hexKey = prefs.getString(SettingsActivity.PREF_KEY, null)
+        val prefs = PrefsHelper.getPrefs(this)
+        val hexKey = prefs.getString(PrefsHelper.PREF_KEY, null)
         hmacKey = hexKey?.let { hexStringToBytes(it) }
         Log.d(TAG, "HMAC key loaded: ${if (hmacKey != null) "${hmacKey!!.size} bytes" else "none"}")
     }
diff --git a/android/app/src/main/java/com/eddy/atomrelay/PrefsHelper.kt b/android/app/src/main/java/com/eddy/atomrelay/PrefsHelper.kt
new file mode 100644
index 0000000..4a4fec5
--- /dev/null
+++ b/android/app/src/main/java/com/eddy/atomrelay/PrefsHelper.kt
@@ -0,0 +1,33 @@
+package com.eddy.atomrelay
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.util.Log
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+
+object PrefsHelper {
+
+    private const val TAG = "PrefsHelper"
+    const val PREFS_NAME = "relay_prefs"
+    const val PREF_KEY = "hmac_key"
+
+    fun getPrefs(context: Context): SharedPreferences {
+        return try {
+            val masterKey = MasterKey.Builder(context)
+                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                .build()
+
+            EncryptedSharedPreferences.create(
+                context,
+                PREFS_NAME,
+                masterKey,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            )
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to create EncryptedSharedPreferences", e)
+            context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+        }
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/java/com/eddy/atomrelay/SettingsActivity.kt b/android/app/src/main/java/com/eddy/atomrelay/SettingsActivity.kt
index 996b56e..db9d949 100644
--- a/android/app/src/main/java/com/eddy/atomrelay/SettingsActivity.kt
+++ b/android/app/src/main/java/com/eddy/atomrelay/SettingsActivity.kt
@@ -27,8 +27,6 @@ import java.security.SecureRandom
 class SettingsActivity : AppCompatActivity() {
 
     companion object {
-        const val PREFS_NAME = "relay_prefs"
-        const val PREF_KEY = "hmac_key"
         const val RESULT_SCAN = 100
         private const val TAG = "SettingsActivity"
         private const val ESP_VENDOR_ID = 0x303a
@@ -158,8 +156,8 @@ class SettingsActivity : AppCompatActivity() {
             handler.post {
                 when (result) {
                     is KeyResult.Success -> {
-                        val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-                        prefs.edit().putString(PREF_KEY, result.hexKey).apply()
+                        val prefs = PrefsHelper.getPrefs(this@SettingsActivity)
+                        prefs.edit().putString(PrefsHelper.PREF_KEY, result.hexKey).apply()
                         Toast.makeText(this, "Beveiligingssleutel gelezen", Toast.LENGTH_LONG).show()
                         cleanupAction()
                         setResult(RESULT_SCAN)
diff --git a/android/app/src/main/java/com/eddy/atomrelay/UsbKeyReceiver.kt b/android/app/src/main/java/com/eddy/atomrelay/UsbKeyReceiver.kt
index 6b58640..63aa09b 100644
--- a/android/app/src/main/java/com/eddy/atomrelay/UsbKeyReceiver.kt
+++ b/android/app/src/main/java/com/eddy/atomrelay/UsbKeyReceiver.kt
@@ -211,8 +211,8 @@ class UsbKeyReceiver : BroadcastReceiver() {
                     val hexKey = keyLine.removePrefix("HMAC_KEY:").trim()
                     if (hexKey.length == 64 && hexKey.all { it in "0123456789ABCDEFabcdef" }) {
                         val upperKey = hexKey.uppercase()
-                        val prefs = context.getSharedPreferences(SettingsActivity.PREFS_NAME, Context.MODE_PRIVATE)
-                        prefs.edit().putString(SettingsActivity.PREF_KEY, upperKey).apply()
+                        val prefs = PrefsHelper.getPrefs(context)
+                        prefs.edit().putString(PrefsHelper.PREF_KEY, upperKey).apply()
                         Log.d(TAG, "HMAC key saved (${upperKey.length} chars)")
                         handler.post {
                             Toast.makeText(context, "Beveiligingssleutel gelezen", Toast.LENGTH_LONG).show()
@@ -248,8 +248,8 @@ class UsbKeyReceiver : BroadcastReceiver() {
 
                     if (okSb.contains("OK")) {
                         Log.d(TAG, "Key provisioned successfully, saving to prefs")
-                        val prefs = context.getSharedPreferences(SettingsActivity.PREFS_NAME, Context.MODE_PRIVATE)
-                        prefs.edit().putString(SettingsActivity.PREF_KEY, newKey).apply()
+                        val prefs = PrefsHelper.getPrefs(context)
+                        prefs.edit().putString(PrefsHelper.PREF_KEY, newKey).apply()
                         handler.post {
                             Toast.makeText(context, "Beveiligingssleutel gelezen", Toast.LENGTH_LONG).show()
                         }