diff --git a/CMakeLists.txt b/CMakeLists.txt
index 172733840..d0c27c503 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -890,7 +890,8 @@ if (ENABLE_DISCORD_RPC)
     target_compile_definitions(shadps4 PRIVATE ENABLE_DISCORD_RPC)
 endif()
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+# Optional due to https://github.com/shadps4-emu/shadPS4/issues/1704
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ENABLE_USERFAULTFD)
     target_compile_definitions(shadps4 PRIVATE ENABLE_USERFAULTFD)
 endif()
 
diff --git a/src/core/file_sys/fs.cpp b/src/core/file_sys/fs.cpp
index 45ba67b93..bf340e9e3 100644
--- a/src/core/file_sys/fs.cpp
+++ b/src/core/file_sys/fs.cpp
@@ -171,6 +171,9 @@ void HandleTable::DeleteHandle(int d) {
 
 File* HandleTable::GetFile(int d) {
     std::scoped_lock lock{m_mutex};
+    if (d < 0 || d >= m_files.size()) {
+        return nullptr;
+    }
     return m_files.at(d);
 }
 
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index df05b73a3..f8efd9b81 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -161,10 +161,18 @@ RenderState Rasterizer::PrepareRenderState(u32 mrt_mask) {
         state.depth_attachment = {
             .imageView = *image_view.image_view,
             .imageLayout = vk::ImageLayout::eUndefined,
-            .loadOp = is_clear ? vk::AttachmentLoadOp::eClear : vk::AttachmentLoadOp::eLoad,
+            .loadOp = is_clear && regs.depth_control.depth_enable ? vk::AttachmentLoadOp::eClear
+                                                                  : vk::AttachmentLoadOp::eLoad,
             .storeOp = vk::AttachmentStoreOp::eStore,
-            .clearValue = vk::ClearValue{.depthStencil = {.depth = regs.depth_clear,
-                                                          .stencil = regs.stencil_clear}},
+            .clearValue = vk::ClearValue{.depthStencil = {.depth = regs.depth_clear}},
+        };
+        state.stencil_attachment = {
+            .imageView = *image_view.image_view,
+            .imageLayout = vk::ImageLayout::eUndefined,
+            .loadOp = is_clear && regs.depth_control.stencil_enable ? vk::AttachmentLoadOp::eClear
+                                                                    : vk::AttachmentLoadOp::eLoad,
+            .storeOp = vk::AttachmentStoreOp::eStore,
+            .clearValue = vk::ClearValue{.depthStencil = {.stencil = regs.stencil_clear}},
         };
         texture_cache.TouchMeta(htile_address, slice, false);
         state.has_depth =
@@ -778,6 +786,7 @@ void Rasterizer::BeginRendering(const GraphicsPipeline& pipeline, RenderState& s
                           desc.view_info.range);
         }
         state.depth_attachment.imageLayout = image.last_state.layout;
+        state.stencil_attachment.imageLayout = image.last_state.layout;
         image.usage.depth_target = true;
         image.usage.stencil = has_stencil;
     }
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp
index 2c4e7a3c6..81415f8b5 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.cpp
+++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp
@@ -47,7 +47,7 @@ void Scheduler::BeginRendering(const RenderState& new_state) {
                                  ? render_state.color_attachments.data()
                                  : nullptr,
         .pDepthAttachment = render_state.has_depth ? &render_state.depth_attachment : nullptr,
-        .pStencilAttachment = render_state.has_stencil ? &render_state.depth_attachment : nullptr,
+        .pStencilAttachment = render_state.has_stencil ? &render_state.stencil_attachment : nullptr,
     };
 
     current_cmdbuf.beginRendering(rendering_info);
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h
index cdd33745a..fd5e68373 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.h
+++ b/src/video_core/renderer_vulkan/vk_scheduler.h
@@ -21,6 +21,7 @@ class Instance;
 struct RenderState {
     std::array<vk::RenderingAttachmentInfo, 8> color_attachments{};
     vk::RenderingAttachmentInfo depth_attachment{};
+    vk::RenderingAttachmentInfo stencil_attachment{};
     u32 num_color_attachments{};
     bool has_depth{};
     bool has_stencil{};