diff --git a/src/xenia/gpu/vulkan/vulkan_command_processor.cc b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
index 12ccd620f..4cdd57635 100644
--- a/src/xenia/gpu/vulkan/vulkan_command_processor.cc
+++ b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
@@ -1625,6 +1625,9 @@ void VulkanCommandProcessor::IssueSwap(uint32_t frontbuffer_ptr,
         render_pass_begin_info.pClearValues = nullptr;
         deferred_command_buffer_.CmdVkBeginRenderPass(
             &render_pass_begin_info, VK_SUBPASS_CONTENTS_INLINE);
+        current_render_pass_ = swap_apply_gamma_render_pass_;
+        current_framebuffer_ =
+            nullptr;  // Not a render target cache framebuffer
 
         VkViewport viewport;
         viewport.x = 0.0f;
@@ -1685,6 +1688,7 @@ void VulkanCommandProcessor::IssueSwap(uint32_t frontbuffer_ptr,
         deferred_command_buffer_.CmdVkDraw(3, 1, 0, 0);
 
         deferred_command_buffer_.CmdVkEndRenderPass();
+        current_render_pass_ = VK_NULL_HANDLE;
 
         // Insert the release barrier.
         PushImageMemoryBarrier(