diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index d01235d31..1a6784a71 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -182,6 +182,8 @@ class Config(object):
                             ) % (entry_path, )
                             continue
 
+                        files.add(config_path)
+
                     config_files.extend(sorted(files))
                 else:
                     config_files.append(config_path)