A machine for filling cannabis oil or other fluids into dispensing cartridges includes a fluid reservoir, a fluid pump, and an injection needle. The fluid pump may be disposed directly below the fluid reservoir, and the injection needle may be disposed directly below the fluid pump. A lift mechanism raises and lowers a movable cartridge holder to move a dispensing cartridge toward and away from the injection needle. A heater may be formed about the needle to heat fluid therein. Heaters may also be provided for heating the fluid reservoir and the fluid pump.