diff --git a/src/sql/plugins/forms/upgrade/upgrade_forms_control_for_conditional_id.sql b/src/sql/plugins/forms/upgrade/upgrade_forms_control_for_conditional_id.sql
new file mode 100644
index 000000000..ff5f2af75
--- /dev/null
+++ b/src/sql/plugins/forms/upgrade/upgrade_forms_control_for_conditional_id.sql
@@ -0,0 +1 @@
+UPDATE forms_control INNER JOIN forms_display ON forms_control.id_control_target = forms_display.id_display SET forms_control.id_control_target = forms_display.id_composite;