Fix NO RC handling (fixes #1263)

@hsteinhaus This should fix the issue you're currently facing.