diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
index d23ee203f2cfe31edb4d1eb2ac8b66db1638455e..ed4afe2112e95739aa13d6dfbc78d90b9930ea41 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
@@ -19,7 +19,7 @@ namespace DB
 template <typename ArgumentFieldType>
 struct AggregateFunctionQuantileData
 {
-	typedef ReservoirSampler<ArgumentFieldType> Sample;
+	typedef ReservoirSampler<ArgumentFieldType, ReservoirSamplerOnEmpty::RETURN_DEFAULT> Sample;
 	Sample sample;
 };
 
@@ -33,7 +33,7 @@ template <typename ArgumentFieldType, bool returns_float = true>
 class AggregateFunctionQuantile : public IUnaryAggregateFunction<AggregateFunctionQuantileData<ArgumentFieldType> >
 {
 private:
-	typedef ReservoirSampler<ArgumentFieldType> Sample;
+	typedef ReservoirSampler<ArgumentFieldType, ReservoirSamplerOnEmpty::RETURN_DEFAULT> Sample;
 
 	double level;
 	DataTypePtr type;
@@ -108,7 +108,7 @@ template <typename ArgumentFieldType, bool returns_float = true>
 class AggregateFunctionQuantiles : public IUnaryAggregateFunction<AggregateFunctionQuantileData<ArgumentFieldType> >
 {
 private:
-	typedef ReservoirSampler<ArgumentFieldType> Sample;
+	typedef ReservoirSampler<ArgumentFieldType, ReservoirSamplerOnEmpty::RETURN_DEFAULT> Sample;
 
 	typedef std::vector<double> Levels;
 	Levels levels;
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
index 39e675f9c04b68c2393ed1a4ab6a91b7386bd256..32b45569313463f0312942c73ec605b37d57f4f3 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <stats/ReservoirSampler.h>
-
 #include <DB/IO/WriteHelpers.h>
 #include <DB/IO/ReadHelpers.h>