diff --git a/src/manage_sql_report_formats.c b/src/manage_sql_report_formats.c
index 0a1b49b39..2c7c9d1ae 100644
--- a/src/manage_sql_report_formats.c
+++ b/src/manage_sql_report_formats.c
@@ -3997,11 +3997,18 @@ apply_report_format (gchar *report_format_id,
 
   rf_dependencies_string
     = sql_string ("SELECT value"
-                  "  FROM report_format_params"
-                  " WHERE report_format = %llu"
-                  "   AND type = %i",
-                  report_format,
-                  REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST);
+                  "  FROM report_config_params"
+                  "  WHERE report_config = %llu AND name = 'Attached report formats'",
+                  report_config);
+
+  if (!rf_dependencies_string || !strcmp (rf_dependencies_string, ""))
+    rf_dependencies_string
+      = sql_string ("SELECT value"
+                    "  FROM report_format_params"
+                    "  WHERE report_format = %llu"
+                    "    AND type = %i",
+                    report_format,
+                    REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST);
 
   if (rf_dependencies_string)
     {