diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html
index b335207c..b4ac7132 100644
--- a/apimanager/metrics/templates/metrics/api.html
+++ b/apimanager/metrics/templates/metrics/api.html
@@ -170,7 +170,7 @@ <h2>{% trans "Filter" %}</h2>
     							<td>{{ metric.url }}</td>
 								<td>{{ metric.source_ip}}</td>
 								<td>{{ metric.target_ip }}</td>
-    							<td>{{ metric.date|date:"Y-m-d H:i:s.u" }}</td>
+    							<td>{{ metric.date}}</td>
 								<td>{{ metric.duration }}</td>
     						</tr>
 
diff --git a/apimanager/metrics/views.py b/apimanager/metrics/views.py
index c697acfc..d8413846 100644
--- a/apimanager/metrics/views.py
+++ b/apimanager/metrics/views.py
@@ -115,7 +115,7 @@ def to_django(self, metrics):
         """
         for metric in metrics:
             metric['date'] = datetime.datetime.strptime(
-                metric['date'], settings.API_DATE_FORMAT_WITH_SECONDS )
+                metric['date'], settings.API_DATE_FORMAT_WITH_MILLISECONDS).isoformat(timespec='milliseconds')
         return metrics
 
     def to_api(self, cleaned_data):