diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 48ff174ebbe..25fca0eef6d 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -795,7 +795,9 @@ static int vfswrap_openat(vfs_handle_struct *handle,
 			mode);
 
 	if (became_root) {
+		errno_t old_errno = errno;
 		unbecome_root();
+		errno = old_errno;
 	}
 
 done: