diff --git a/src/wlserver.cpp b/src/wlserver.cpp
index 0f1a0f7..194b75d 100644
--- a/src/wlserver.cpp
+++ b/src/wlserver.cpp
@@ -654,6 +654,11 @@ static void gamescope_xwayland_handle_set_hdr_metadata( struct wl_client *client
 			return;
 		}
 
+		// Check validity of this metadata,
+		// if it's garbage, just toss it...
+		if (!max_cll || !max_fall || (!white_point_x && !white_point_y))
+			return;
+
 		hdr_output_metadata metadata = {};
 		metadata.metadata_type = 0;