diff --git a/ApplicationCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp b/ApplicationCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp
index da6115c5fd..ee288db89f 100644
--- a/ApplicationCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp
+++ b/ApplicationCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp
@@ -245,6 +245,34 @@ TEST(RiaTimeHistoryCurveResampler, Test_Resampling_Week)
     EXPECT_EQ(toTime_t("2018-01-01"), resampler.resampledTimeSteps()[8]);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+TEST(RiaTimeHistoryCurveResampler, Test_Resampling_NoSampleCrossingPeriodBoundary)
+{
+    std::vector<QString> timeStrings(
+        {
+            "2017-01-02",
+            "2017-06-15",
+            "2017-12-24"
+        }
+    );
+
+    std::vector<double> dataValues(
+        {
+            0.0,
+            0.0,
+            0.0
+        }
+    );
+
+    RiaTimeHistoryCurveResampler resampler;
+    resampler.setCurveData(dataValues, toTime_tVector(timeStrings));
+    resampler.resampleAndComputeWeightedMeanValues(DateTimePeriod::YEAR);
+
+    EXPECT_EQ(0, (int)resampler.resampledTimeSteps().size());
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------