diff --git a/sys/kms/gstkmssink.c b/sys/kms/gstkmssink.c
index 651a8eb77b..bc85ffe0f1 100644
--- a/sys/kms/gstkmssink.c
+++ b/sys/kms/gstkmssink.c
@@ -573,6 +573,12 @@ set_drm_property (gint fd, guint32 object, guint32 object_type,
     drmModePropertyPtr property;
 
     property = drmModeGetProperty (fd, properties->props[i]);
+
+    /* GstStructure parser limits the set of supported character, so we
+     * replace the invalid characters with '-'. In DRM, this is generally
+     * replacing spaces into '-'. */
+    g_strcanon (property->name, G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS, '-');
+
     if (!strcmp (property->name, prop_name)) {
       drmModeObjectSetProperty (fd, object, object_type,
           property->prop_id, value);