diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc
index 0a88aff5c9a..4a297d546d1 100644
--- a/src/core/ext/transport/chttp2/transport/frame.cc
+++ b/src/core/ext/transport/chttp2/transport/frame.cc
@@ -40,6 +40,7 @@ constexpr uint8_t kFrameTypeSettings = 4;
 constexpr uint8_t kFrameTypePing = 6;
 constexpr uint8_t kFrameTypeGoaway = 7;
 constexpr uint8_t kFrameTypeWindowUpdate = 8;
+constexpr uint8_t kFrameTypePushPromise = 5;
 
 constexpr uint8_t kFlagEndStream = 1;
 constexpr uint8_t kFlagAck = 1;
@@ -175,6 +176,7 @@ class SerializeHeaderAndPayload {
   }
 
   void operator()(Http2SettingsFrame& frame) {
+    // Six bytes per setting (u16 id, u32 value)
     const size_t payload_size = 6 * frame.settings.size();
     auto hdr_and_payload =
         extra_bytes_.TakeFirst(kFrameHeaderSize + payload_size);
@@ -463,7 +465,7 @@ void Serialize(absl::Span<Http2Frame> frames, SliceBuffer& out) {
   for (auto& frame : frames) {
     // Bytes needed for framing
     buffer_needed += kFrameHeaderSize;
-    // Bytes needed for unserialized payload
+    // Bytes needed for frame payload
     buffer_needed += absl::visit(SerializeExtraBytesRequired(), frame);
   }
   SerializeHeaderAndPayload serialize(buffer_needed, out);
@@ -492,6 +494,10 @@ absl::StatusOr<Http2Frame> ParseFramePayload(const Http2FrameHeader& hdr,
       return ParseGoawayFrame(hdr, payload);
     case kFrameTypeWindowUpdate:
       return ParseWindowUpdateFrame(hdr, payload);
+    case kFrameTypePushPromise:
+      return absl::InternalError(
+          "push promise not supported (and SETTINGS_ENABLE_PUSH explicitly "
+          "disabled).");
     default:
       return Http2UnknownFrame{};
   }
diff --git a/test/core/transport/chttp2/frame_test.cc b/test/core/transport/chttp2/frame_test.cc
index b09afecdef3..a353d0fa1ef 100644
--- a/test/core/transport/chttp2/frame_test.cc
+++ b/test/core/transport/chttp2/frame_test.cc
@@ -237,7 +237,24 @@ TEST(Frame, ParsePadded) {
                                         SliceBufferFromString("hello")}));
 }
 
+TEST(Frame, UnknownIgnored) {
+  // 77 = some random undefined frame
+  EXPECT_EQ(
+      ParseFrame(0, 0, 10, 77, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+      Http2Frame(Http2UnknownFrame{}));
+  // 2 = PRIORITY, we just ignore it
+  EXPECT_EQ(
+      ParseFrame(0, 0, 10, 2, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+      Http2Frame(Http2UnknownFrame{}));
+}
+
 TEST(Frame, ParseRejects) {
+  // 5 == PUSH_PROMISE
+  EXPECT_THAT(
+      ValidateFrame(0, 0, 10, 5, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+      StatusIs(absl::StatusCode::kInternal,
+               "push promise not supported (and SETTINGS_ENABLE_PUSH "
+               "explicitly disabled)."));
   EXPECT_THAT(ValidateFrame(0, 0, 0, 0, 0, 0, 0, 0, 0),
               StatusIs(absl::StatusCode::kInternal,
                        "invalid stream id: {DATA: flags=0, "