diff --git a/core/ArchiveExtractor.py b/core/ArchiveExtractor.py
index 8ba4086616b98ba470422b6e8ba5f0e9b3b6acee..5fe1a52c43fe999f71ff69d246a650aed382de36 100755
--- a/core/ArchiveExtractor.py
+++ b/core/ArchiveExtractor.py
@@ -134,7 +134,7 @@ class ArchiveExtractor:
             self,
             attribute,
             dateStart,
-            dateStop=datetime.datetime.now(),
+            dateStop=None,
             ):
         """
         Query attribute data from an archiver database, get all points between dates.
@@ -148,9 +148,11 @@ class ArchiveExtractor:
         dateStart : datetime.datetime, string
             Start date for extraction. If string, it will be parsed.
 
-        dateStop : datetime.datetime, string
-            Stop date for extraction. If string, it will be parsed.
-            Default is now (datetime.datetime.now())
+        dateStop : datetime.datetime, string, None
+            Stop date for extraction.
+            If string, it will be parsed.
+            If None, it takes the current date and time.
+            Default is None (now).
 
         Exceptions
         ----------
@@ -170,6 +172,8 @@ class ArchiveExtractor:
         # Parse date if it is string
         if type(dateStart) is str:
             dateStart = self.dateparse(dateStart)
+        if dateStop is None:
+            dateStop = datetime.datetime.now()
         if type(dateStop) is str:
             dateStop = self.dateparse(dateStop)