Skip entity auto-detection when explicitely passed

The call to .first might cause an unnecessary db call otherwise