diff --git a/test/property/test_webhook_handler.rb b/test/property/test_webhook_handler.rb
index 0e8e6c4546e1973c46f234501c9df52bdb9ef4c0..1b7046e0d796c86f8f419349fa2694ca1f28df4f 100644
--- a/test/property/test_webhook_handler.rb
+++ b/test/property/test_webhook_handler.rb
@@ -331,4 +331,28 @@ class WebhookPropertyTest < Minitest::Test
 		}
 	end
 	em :test_inbound_resend_emits_correct_resend_stream_event
+
+	def test_inbound_empty_text_no_media_returns_400
+		property_of {
+			Webhook
+				.new(REDIS)
+				.type { "message-received" }
+				.message { |registered, jid, dir, _|
+					Message
+						.new(REDIS)
+						.to { [nanpa_phone] }
+						.text { "" }
+						.media { nil }
+						.generate(registered, jid, dir)
+				}
+				.generate
+		}.check { |metadata, example|
+			result = invoke_webhook(example)
+			assert_equal [400, {}, "Missing params\n"], result
+			assert_empty written
+			entries = REDIS.stream_entries("messages").sync
+			assert_empty entries
+		}
+	end
+	em :test_inbound_empty_text_no_media_returns_400
 end