diff --git a/DataInterface/DataCondenser.cpp b/DataInterface/DataCondenser.cpp
index 3341790..f3d0fb8 100644
--- a/DataInterface/DataCondenser.cpp
+++ b/DataInterface/DataCondenser.cpp
@@ -359,7 +359,7 @@ void DataCondenser::CleanData(const RRA::type& rra)
 	std::string table = GetDestinationTable(rra);
 	int periodInSeconds = static_cast<int>(rra) * 400;
 	if (rra == RRA::Yearly)
-		periodInSeconds *= 5;
+		periodInSeconds *= 10;
 
 	int timestamp = DateTime::GetTimestamp() + DateTime::GetUTCOffset() - periodInSeconds;
 
diff --git a/DataInterface/GraphClient.cpp b/DataInterface/GraphClient.cpp
index ce4963b..efd9022 100644
--- a/DataInterface/GraphClient.cpp
+++ b/DataInterface/GraphClient.cpp
@@ -37,6 +37,8 @@ nlohmann::json GraphClient::GetGraphData(int deviceId, const std::vector<int>& d
 			table = "datalog-monthly";
 			break;
 		case DataStorage::Timespan::Year:
+		case DataStorage::Timespan::_2_Year:
+		case DataStorage::Timespan::_5_Year:
 			table = "datalog-yearly";
 			break;
 		default: