diff --git a/ffplayout.yml b/ffplayout.yml
index 170fcc89..ec4622cb 100644
--- a/ffplayout.yml
+++ b/ffplayout.yml
@@ -106,8 +106,8 @@ storage:
     filler_path: "/mediaStorage/filler/filler-clips"
     filler_clip: "/mediaStorage/filler/filler.mp4"
     extensions:
-        - "*.mp4"
-        - "*.mkv"
+        - ".mp4"
+        - ".mkv"
     shuffle: True
 
 
diff --git a/ffplayout/folder.py b/ffplayout/folder.py
index 94952c6a..b98d1992 100644
--- a/ffplayout/folder.py
+++ b/ffplayout/folder.py
@@ -52,7 +52,7 @@ class MediaStore:
     def fill(self):
         for ext in _storage.extensions:
             self.store.extend(
-                glob.glob(os.path.join(self.folder, '**', ext),
+                glob.glob(os.path.join(self.folder, '**', '*{}'.format(ext)),
                           recursive=True))
 
         if _storage.shuffle: