diff --git a/client/client_props.c b/client/client_props.c
index 908fbb0f..de9db8e3 100644
--- a/client/client_props.c
+++ b/client/client_props.c
@@ -85,6 +85,11 @@ int cfg_parse_property(struct mosq_config *cfg, int argc, char *argv[], int *idx
 		return MOSQ_ERR_INVAL;
 	}
 
+	if(mosquitto_property_command_check(cmd, identifier)){
+		fprintf(stderr, "Error: %s property not allow for %s in --property argument.\n\n", propname, cmdname);
+		return MOSQ_ERR_INVAL;
+	}
+
 	if(identifier == MQTT_PROP_USER_PROPERTY){
 		if((*idx)+3 > argc-1){
 			/* Not enough args */