diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index ef4316862d438dab058e921c9503914e9e2abbcd..a5ca928c717fdc0a30fc44d11504ebcf2920a993 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -1667,6 +1667,8 @@ def get_search_box(nav, lon, lat):
 # amv_files_path: directory containing AMVs, '/home/user/amvdir/'
 # return dict: aeolus time -> tuple (amv_lon, amv_lat, amv_pres, amv_spd, amv_dir)
 def match_amvs_to_aeolus(aeolus_dict, amv_files_path, amv_source='OPS', band='14', amv_files=None):
+    if amv_files is None:
+        amv_files = get_datasource(amv_files_path, 'FMWK')
     nav = amv_files.get_navigation()
     amv_params = amv_files.get_parameters()
     match_dict = {}