Abstract: A sample module for a sampling while drilling tool includes a sample fluid flowline operatively connectable between a sample chamber and an inlet, for passing a downhole fluid. A primary piston divides the sample chamber into a sample volume and a buffer volume and includes a first face in fluid communication with the sample volume and a second face in fluid communication with the buffer volume. An agitator is disposed in the sample volume for agitating the sample fluid. A secondary piston includes a first face in fluid communication with the buffer volume having buffer fluid disposed therein and a second face.