diff --git a/module/metric/model.php b/module/metric/model.php
index fe03e90a2a..9a770a4b2a 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -1537,8 +1537,9 @@ class metricModel extends model
             return array($begin, $end);
         }
 
-        if($key == 'calcDate' && isset($query[$key]))
+        if($key == 'calcDate')
         {
+            if(!isset($query[$key]) && $query['dateType'] == 'nodate') $query['calcDate'] = 7;
             return date('Y-m-d', strtotime("-{$query[$key]} days"));
         }