diff --git a/src/persistence/matrix_state.rs b/src/persistence/matrix_state.rs
index e08d9813..f45e968f 100644
--- a/src/persistence/matrix_state.rs
+++ b/src/persistence/matrix_state.rs
@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     app_data_dir,
     login::login_screen::LoginAction,
+    persistence::utils::write_file_securely,
 };
 
 /// The data needed to re-build a client.
@@ -116,7 +117,7 @@ pub async fn most_recent_user_id() -> Option<OwnedUserId> {
 
 /// Save which user was the most recently logged in.
 async fn save_latest_user_id(user_id: &UserId) -> anyhow::Result<()> {
-    tokio::fs::write(
+    write_file_securely(
         app_data_dir().join(LATEST_USER_ID_FILE_NAME),
         user_id.as_str(),
     ).await?;
@@ -215,10 +216,7 @@ pub async fn save_session(
         sync_token: None,
         sliding_sync_version
     })?;
-    if let Some(parent) = session_file.parent() {
-        tokio::fs::create_dir_all(parent).await?;
-    }
-    tokio::fs::write(&session_file, serialized_session).await?;
+    write_file_securely(&session_file, serialized_session).await?;
 
     log!("Session persisted to: {}", session_file.display());
     Ok(())
diff --git a/src/persistence/mod.rs b/src/persistence/mod.rs
index e3db2ca3..4c003148 100644
--- a/src/persistence/mod.rs
+++ b/src/persistence/mod.rs
@@ -13,3 +13,7 @@ pub use app_state::*;
 pub mod tsp_state;
 #[cfg(feature = "tsp")]
 pub use tsp_state::*;
+
+/// Utilities for secure file persistence.
+pub mod utils;
+pub use utils::*;
diff --git a/src/persistence/utils.rs b/src/persistence/utils.rs
new file mode 100644
index 00000000..2042e0a9
--- /dev/null
+++ b/src/persistence/utils.rs
@@ -0,0 +1,96 @@
+use std::path::Path;
+use anyhow::{Context, Result};
+use rand::{distributions::Alphanumeric, Rng};
+use tokio::fs::{self, OpenOptions};
+use tokio::io::AsyncWriteExt;
+
+/// Writes data to a file securely and atomically.
+///
+/// This function:
+/// 1. Creates a temporary file in the same directory as the target file.
+/// 2. Sets restrictive permissions (0600 on Unix) on the temporary file.
+/// 3. Writes the data to the temporary file.
+/// 4. Atomically renames the temporary file to the target file.
+///
+/// This ensures that the file is never partially written or accessible to other users
+/// during the write process.
+pub async fn write_file_securely(path: impl AsRef<Path>, content: impl AsRef<[u8]>) -> Result<()> {
+    let path = path.as_ref();
+    let parent = path.parent().unwrap_or_else(|| Path::new("."));
+
+    // Create parent directory if it doesn't exist
+    if !parent.exists() {
+        fs::create_dir_all(parent).await.context("Failed to create parent directory")?;
+    }
+
+    // Generate a random temporary filename
+    let temp_name: String = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(10)
+        .map(char::from)
+        .collect();
+    let temp_path = parent.join(format!(".{}.tmp", temp_name));
+
+    // Configure OpenOptions for secure creation
+    let mut options = OpenOptions::new();
+    options.write(true).create(true).truncate(true);
+
+    #[cfg(unix)]
+    options.mode(0o600); // Read/write only for owner
+
+    // Write content to temporary file
+    let mut file = options.open(&temp_path).await.context("Failed to open temp file")?;
+    file.write_all(content.as_ref()).await.context("Failed to write to temp file")?;
+    file.flush().await.context("Failed to flush temp file")?;
+
+    // Ensure data is synced to disk
+    file.sync_all().await.context("Failed to sync temp file")?;
+
+    // Atomically rename
+    fs::rename(&temp_path, path).await.context("Failed to rename temp file to target")?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::env;
+
+    #[tokio::test]
+    async fn test_write_file_securely() -> Result<()> {
+        let mut dir = env::temp_dir();
+        // Use a random dir name to avoid conflicts
+        let dir_name: String = rand::thread_rng()
+            .sample_iter(&Alphanumeric)
+            .take(10)
+            .map(char::from)
+            .collect();
+        dir.push(format!("robrix_test_{}", dir_name));
+
+        let _ = tokio::fs::create_dir_all(&dir).await;
+
+        let file_path = dir.join("secret.txt");
+        let content = b"secret data";
+
+        write_file_securely(&file_path, content).await?;
+
+        assert!(file_path.exists());
+        let read_content = tokio::fs::read(&file_path).await?;
+        assert_eq!(read_content, content);
+
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::MetadataExt;
+            let metadata = std::fs::metadata(&file_path)?;
+            let mode = metadata.mode();
+            assert_eq!(mode & 0o777, 0o600, "File permissions should be 0600");
+        }
+
+        // Cleanup
+        let _ = tokio::fs::remove_file(&file_path).await;
+        let _ = tokio::fs::remove_dir(&dir).await;
+
+        Ok(())
+    }
+}