diff --git a/lib/pleroma/user/backup.ex b/lib/pleroma/user/backup.ex
index 2568089a4..7feaa22bf 100644
--- a/lib/pleroma/user/backup.ex
+++ b/lib/pleroma/user/backup.ex
@@ -216,13 +216,15 @@ def run(%__MODULE__{} = backup) do
   end
 
   defp tempdir do
+    rand = :crypto.strong_rand_bytes(8) |> Base.url_encode64(padding: false)
+    subdir = "backup-#{rand}"
+
     case Config.get([__MODULE__, :tempdir]) do
       nil ->
-        System.tmp_dir!()
+        Path.join([System.tmp_dir!(), subdir])
 
       path ->
-        rand = :crypto.strong_rand_bytes(8) |> Base.url_encode64(padding: false)
-        Path.join([path, rand])
+        Path.join([path, subdir])
     end
   end