diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 3ee343c672662c13a03dfb079ba2857b0ce1200d..6fb1f3cadf8366c6bd5018c55ee1bc04bb8fed94 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -638,6 +638,10 @@ function filter_list_format($format_id) {
         $filter->title = $filter_info[$name]['title'];
         // Unpack stored filter settings.
         $filter->settings = (isset($filter->settings) ? unserialize($filter->settings) : array());
+        // Merge in default settings.
+        if (isset($filter_info[$name]['default settings'])) {
+          $filter->settings += $filter_info[$name]['default settings'];
+        }
 
         $format_filters[$name] = $filter;
       }