diff --git a/app/api/CronApi.php b/app/api/CronApi.php
index 7464fb5..0090e7b 100644
--- a/app/api/CronApi.php
+++ b/app/api/CronApi.php
@@ -12,6 +12,11 @@ class CronApi extends ApiController
 		$backupWorker = new DatabaseBackup();
 		$backupWorker->purge(5);
 
+		//Old Records Cleanup
+		foreach (SubDeviceManager::getAllSubDevices() as $key => $value) {
+			RecordManager::setHistory($value['subdevice_id']);
+		}
+
 		$this->response(['Value' => 'OK']);
 	}
 
diff --git a/app/models/managers/RecordManager.php b/app/models/managers/RecordManager.php
index 5432195..d26612b 100644
--- a/app/models/managers/RecordManager.php
+++ b/app/models/managers/RecordManager.php
@@ -102,7 +102,7 @@ class RecordManager{
 
 	public static function clean ($day) {
 		if (isset($day)) {
-			Db::command ('DELETE FROM records WHERE `time` < ADDDATE(NOW(), INTERVAL -? DAY);', array($day));
+			Db::command ('DELETE FROM records WHERE `time` < ADDDATE(NOW(), INTERVAL ? DAY);', array($day));
 		}
 	}
 
@@ -110,5 +110,10 @@ class RecordManager{
 	public static function cleanSubdeviceRecords ($subDeviceId) {
 		Db::command ('DELETE FROM records WHERE subdevice_id = ?);', array($subDeviceId));
 	}
+
+	public static function setHistory($subDeviceId){
+		$history = SubDeviceManager::getSubDevice($subDeviceId)['history'];
+		if ($history > 0) self::clean(-abs($history));
+	} 
 }
 ?>