diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh
index 24b2942..c9d16a2 100755
--- a/tests/t0109-gitconfig.sh
+++ b/tests/t0109-gitconfig.sh
@@ -37,5 +37,6 @@ test_no_home_access_success foo/tree/file-1
 test_no_home_access_success foo/commit
 test_no_home_access_success foo/diff
 test_no_home_access_success foo/patch
+test_no_home_access_success foo/snapshot/master.tar.gz
 
 test_done
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 42b7489..8a72080 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -16,6 +16,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 {
 	struct argv_array argv = ARGV_ARRAY_INIT;
 	const char **nargv;
+	char *user_home, *xdg_home;
 	int result;
 	argv_array_push(&argv, "snapshot");
 	argv_array_push(&argv, format);
@@ -38,7 +39,15 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 	/* argv_array guarantees a trailing NULL entry. */
 	memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
+	user_home = getenv("HOME");
+	xdg_home = getenv("XDG_CONFIG_HOME");
+	unsetenv("HOME");
+	unsetenv("XDG_CONFIG_HOME");
 	result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+	if (user_home)
+		setenv("HOME", user_home, 1);
+	if (xdg_home)
+		setenv("XDG_CONFIG_HOME", xdg_home, 1);
 	argv_array_clear(&argv);
 	free(nargv);
 	return result;