A handguard assembly for attaching to a firearm is disclosed. The handguard assembly comprises an upper component, a lower component, a front cap, and a rear cap. The front cap and rear cap are secured within the lower component. The front cap and rear cap have curved top sides for supporting the barrel of the firearm. The lower component has slots in the sides to receive tabs from the sides of the upper component. When the upper component and lower component are attached to the firearm, the components work together to position the barrel in the preferred position so that the sights of the firearm are zeroed when the handguard assembly is attached to the firearm.