diff --git a/app/models/logic.rb b/app/models/logic.rb
index c215f84d3..f76a7992c 100644
--- a/app/models/logic.rb
+++ b/app/models/logic.rb
@@ -27,8 +27,6 @@ module Logic
     in [:number, EmptyOperator]
       operator_class = Eq
     in [:number, _]
-    in [:string, _]
-      operator_class = Eq
     end
 
     if !compatible_type?(left, right)
@@ -41,8 +39,6 @@ module Logic
         Constant.new(left.options.first)
       when :number
         Constant.new(0)
-      when :string
-        Constant.new('')
       end
     end
 
diff --git a/app/models/logic/champ_value.rb b/app/models/logic/champ_value.rb
index 1249db4c3..441d85c14 100644
--- a/app/models/logic/champ_value.rb
+++ b/app/models/logic/champ_value.rb
@@ -4,14 +4,12 @@ class Logic::ChampValue < Logic::Term
     :checkbox,
     :integer_number,
     :decimal_number,
-    :drop_down_list,
-    :text
+    :drop_down_list
   )
 
   CHAMP_VALUE_TYPE = {
     boolean: :boolean,
     number: :number,
-    string: :string,
     enum: :enum,
     empty: :empty,
     unmanaged: :unmanaged
@@ -30,7 +28,7 @@ class Logic::ChampValue < Logic::Term
       champ(champs).true?
     when MANAGED_TYPE_DE_CHAMP.fetch(:integer_number), MANAGED_TYPE_DE_CHAMP.fetch(:decimal_number)
       champ(champs).for_api
-    when MANAGED_TYPE_DE_CHAMP.fetch(:drop_down_list), MANAGED_TYPE_DE_CHAMP.fetch(:text)
+    when MANAGED_TYPE_DE_CHAMP.fetch(:drop_down_list)
       champ(champs).value
     end
   end
@@ -44,8 +42,6 @@ class Logic::ChampValue < Logic::Term
       CHAMP_VALUE_TYPE.fetch(:boolean)
     when MANAGED_TYPE_DE_CHAMP.fetch(:integer_number), MANAGED_TYPE_DE_CHAMP.fetch(:decimal_number)
       CHAMP_VALUE_TYPE.fetch(:number)
-    when MANAGED_TYPE_DE_CHAMP.fetch(:text)
-      CHAMP_VALUE_TYPE.fetch(:string)
     when MANAGED_TYPE_DE_CHAMP.fetch(:drop_down_list)
       CHAMP_VALUE_TYPE.fetch(:enum)
     else
diff --git a/spec/models/logic/champ_value_spec.rb b/spec/models/logic/champ_value_spec.rb
index 2bbb750b4..9b7be952c 100644
--- a/spec/models/logic/champ_value_spec.rb
+++ b/spec/models/logic/champ_value_spec.rb
@@ -20,13 +20,6 @@ describe Logic::ChampValue do
     end
   end
 
-  context 'text tdc' do
-    let(:champ) { create(:champ_text, value: 'text') }
-
-    it { expect(champ_value(champ.stable_id).type).to eq(:string) }
-    it { is_expected.to eq('text') }
-  end
-
   context 'integer tdc' do
     let(:champ) { create(:champ_integer_number, value: '42') }
 
diff --git a/spec/models/logic_spec.rb b/spec/models/logic_spec.rb
index 7b7d0b3ca..c7ba00e4e 100644
--- a/spec/models/logic_spec.rb
+++ b/spec/models/logic_spec.rb
@@ -42,12 +42,6 @@ describe Logic do
       it { is_expected.to eq(ds_eq(constant(1), constant(0))) }
     end
 
-    context 'when string empty operator true' do
-      let(:condition) { empty_operator(constant('a'), constant(true)) }
-
-      it { is_expected.to eq(ds_eq(constant('a'), constant(''))) }
-    end
-
     context 'when dropdown empty operator true' do
       let(:drop_down) { create(:type_de_champ_drop_down_list) }
       let(:first_option) { drop_down.drop_down_list_enabled_non_empty_options.first }
diff --git a/spec/models/procedure_revision_spec.rb b/spec/models/procedure_revision_spec.rb
index 7e01495da..47e8e7fba 100644
--- a/spec/models/procedure_revision_spec.rb
+++ b/spec/models/procedure_revision_spec.rb
@@ -631,7 +631,13 @@ describe ProcedureRevision do
 
     def second_champ = procedure.draft_revision.types_de_champ_public.second
 
-    let(:procedure) { create(:procedure, :with_type_de_champ, types_de_champ_count: 2) }
+    let(:procedure) do
+      create(:procedure).tap do |p|
+        p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'l1')
+        p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'l2')
+      end
+    end
+
     let(:draft_revision) { procedure.draft_revision }
     let(:condition) { nil }
 
@@ -649,7 +655,7 @@ describe ProcedureRevision do
     end
 
     context 'when a champ has a valid condition: needed tdc is up in the forms' do
-      let(:condition) { ds_eq(constant('oui'), champ_value(first_champ.stable_id)) }
+      let(:condition) { ds_eq(champ_value(first_champ.stable_id), constant(1)) }
 
       it { is_expected.to be_empty }
     end