We can only submit a buffer if we have one already (#3477)

We can only submit a buffer if we have one already (#3477) #2212