Described herein, are in-wash fabric conditioning compositions, comprising: from about 0.5 to about 40 wt % of an aminopolysiloxane; and water, wherein the aminopolysiloxane and water are present in the form of an emulsion. In-wash fabric conditioning compositions comprising an emulsion comprising from about 0.1 to about 5 wt % of an aminopolysiloxane, based upon the total weight of the in-wash fabric conditioning composition, wherein the aminopolysiloxane comprises amino substituted alkyl moieties, an effective amount of a solvent, and a synthetic wax, are also disclosed. Methods of making and using these compositions are also described.