diff --git a/src/video_core/amdgpu/liverpool.h b/src/video_core/amdgpu/liverpool.h
index 89723ccb9..b10f986b1 100644
--- a/src/video_core/amdgpu/liverpool.h
+++ b/src/video_core/amdgpu/liverpool.h
@@ -305,6 +305,13 @@ struct Liverpool {
         BitField<20, 3, CompareFunc> stencil_bf_func;
         BitField<30, 1, u32> enable_color_writes_on_depth_fail;
         BitField<31, 1, u32> disable_color_writes_on_depth_pass;
+
+        static constexpr u32 Mask() {
+            return decltype(stencil_enable)::mask | decltype(depth_enable)::mask |
+                   decltype(depth_write_enable)::mask | decltype(depth_bounds_enable)::mask |
+                   decltype(depth_func)::mask | decltype(backface_enable)::mask |
+                   decltype(stencil_ref_func)::mask | decltype(stencil_bf_func)::mask;
+        }
     };
 
     enum class StencilFunc : u32 {
@@ -334,6 +341,11 @@ struct Liverpool {
         BitField<12, 4, StencilFunc> stencil_fail_back;
         BitField<16, 4, StencilFunc> stencil_zpass_back;
         BitField<20, 4, StencilFunc> stencil_zfail_back;
+        BitField<24, 8, u32> padding;
+
+        static constexpr u32 Mask() {
+            return ~decltype(padding)::mask;
+        }
     };
 
     union StencilRefMask {
@@ -506,6 +518,11 @@ struct Liverpool {
         u32 GetMask(int buf_id) const {
             return (raw >> (buf_id * 4)) & 0xfu;
         }
+
+        void SetMask(int buf_id, u32 mask) {
+            raw &= ~(0xf << (buf_id * 4));
+            raw |= (mask << (buf_id * 4));
+        }
     };
 
     struct IndexBufferBase {
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
index 7778c4178..6134a82db 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
@@ -37,7 +37,7 @@ struct GraphicsPipelineKey {
     float depth_bias_slope_factor;
     float depth_bias_clamp;
     u32 depth_bias_enable;
-    u32 num_samples = 1;
+    u32 num_samples;
     Liverpool::StencilControl stencil;
     Liverpool::StencilRefMask stencil_ref_front;
     Liverpool::StencilRefMask stencil_ref_back;
@@ -48,7 +48,7 @@ struct GraphicsPipelineKey {
     Liverpool::CullMode cull_mode;
     Liverpool::FrontFace front_face;
     Liverpool::ClipSpace clip_space;
-    Liverpool::ColorBufferMask cb_shader_mask{};
+    Liverpool::ColorBufferMask cb_shader_mask;
     std::array<Liverpool::BlendControl, Liverpool::NumColorBuffers> blend_controls;
     std::array<vk::ColorComponentFlags, Liverpool::NumColorBuffers> write_masks;
 
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index fc42d12fe..7d4292122 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -197,10 +197,13 @@ bool ShouldSkipShader(u64 shader_hash, const char* shader_type) {
 }
 
 bool PipelineCache::RefreshGraphicsKey() {
+    std::memset(&graphics_key, 0, sizeof(GraphicsPipelineKey));
+
     auto& regs = liverpool->regs;
     auto& key = graphics_key;
 
     key.depth = regs.depth_control;
+    key.depth.raw &= Liverpool::DepthControl::Mask();
     key.depth.depth_write_enable.Assign(regs.depth_control.depth_write_enable.Value() &&
                                         !regs.depth_render_control.depth_clear_enable);
     key.depth_bounds_min = regs.depth_bounds_min;
@@ -217,6 +220,7 @@ bool PipelineCache::RefreshGraphicsKey() {
     }
     key.depth_bias_clamp = regs.poly_offset.depth_bias;
     key.stencil = regs.stencil_control;
+    key.stencil.raw &= Liverpool::StencilControl::Mask();
     key.stencil_ref_front = regs.stencil_ref_front;
     key.stencil_ref_back = regs.stencil_ref_back;
     key.prim_type = regs.primitive_type;
@@ -277,7 +281,7 @@ bool PipelineCache::RefreshGraphicsKey() {
         key.blend_controls[remapped_cb].enable.Assign(key.blend_controls[remapped_cb].enable &&
                                                       !col_buf.info.blend_bypass);
         key.write_masks[remapped_cb] = vk::ColorComponentFlags{regs.color_target_mask.GetMask(cb)};
-        key.cb_shader_mask = regs.color_shader_mask;
+        key.cb_shader_mask.SetMask(remapped_cb, regs.color_shader_mask.GetMask(cb));
 
         ++remapped_cb;
     }