diff --git a/pysatMadrigal/instruments/madrigal_dst.py b/pysatMadrigal/instruments/madrigal_dst.py
index 284775f..2498ba6 100644
--- a/pysatMadrigal/instruments/madrigal_dst.py
+++ b/pysatMadrigal/instruments/madrigal_dst.py
@@ -67,7 +67,8 @@
 madrigal_inst_code = 212
 madrigal_tag = {'': {'': "30006"}}
 madrigal_start = dt.datetime(1957, 1, 1)
-madrigal_end = dt.datetime.now(tz=dt.timezone.utc)
+madrigal_end = pysat.utils.time.filter_datetime_input(
+    dt.datetime.now(tz=dt.timezone.utc))
 
 # Local attributes
 #
diff --git a/pysatMadrigal/instruments/madrigal_geoind.py b/pysatMadrigal/instruments/madrigal_geoind.py
index 00f14e3..887738d 100644
--- a/pysatMadrigal/instruments/madrigal_geoind.py
+++ b/pysatMadrigal/instruments/madrigal_geoind.py
@@ -67,7 +67,8 @@
 madrigal_inst_code = 210
 madrigal_tag = {'': {'': "30007"}}
 madrigal_start = dt.datetime(1950, 1, 1)
-madrigal_end = dt.datetime.now(tz=dt.timezone.utc)
+madrigal_end = pysat.utils.time.filter_datetime_input(
+    dt.datetime.now(tz=dt.timezone.utc))
 
 # Local attributes
 #
diff --git a/pysatMadrigal/instruments/methods/general.py b/pysatMadrigal/instruments/methods/general.py
index 43535cf..8a2bfb9 100644
--- a/pysatMadrigal/instruments/methods/general.py
+++ b/pysatMadrigal/instruments/methods/general.py
@@ -1022,7 +1022,8 @@ def download(date_array, inst_code=None, kindat=None, data_path=None,
 
 def get_remote_filenames(inst_code=None, kindat='', user=None, password=None,
                          web_data=None, url="http://cedar.openmadrigal.org",
-                         start=dt.datetime(1900, 1, 1), stop=dt.datetime.now(),
+                         start=dt.datetime(1900, 1, 1),
+                         stop=dt.datetime.now(tz=dt.datetime.utc),
                          date_array=None):
     """Retrieve the remote filenames for a specified Madrigal experiment.
 
@@ -1103,6 +1104,7 @@ def get_remote_filenames(inst_code=None, kindat='', user=None, password=None,
 
     if stop is None:
         stop = dt.datetime.now(tz=dt.timezone.utc)
+    stop = pysat.utils.time.filter_datetime_input(stop)
 
     # If start and stop are identical, increment
     if start == stop: