diff --git a/app/models/champ.rb b/app/models/champ.rb
index 4cbb7a48b..4ff77ccd5 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -12,7 +12,7 @@ class Champ < ActiveRecord::Base
   before_save :multiple_select_to_string, if: Proc.new { type_champ == 'multiple_drop_down_list' }
 
   scope :updated_since?, -> (date) { where('champs.updated_at > ?', date) }
-  scope :public_only, -> { where.not(type: 'ChampPrivate').or(where(private: [false, nil])) }
+  scope :public_only, -> { where(type: 'ChampPublic').or(where(private: false)) }
   scope :private_only, -> { where(type: 'ChampPrivate').or(where(private: true)) }
 
   def public?
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index f6bf5a36d..937a7e000 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -26,7 +26,7 @@ class TypeDeChamp < ActiveRecord::Base
 
   belongs_to :procedure
 
-  scope :public_only, -> { where.not(type: 'TypeDeChampPrivate').or(where(private: [false, nil])) }
+  scope :public_only, -> { where(type: 'TypeDeChampPublic').or(where(private: false)) }
   scope :private_only, -> { where(type: 'TypeDeChampPrivate').or(where(private: true)) }
 
   has_many :champ, inverse_of: :type_de_champ, dependent: :destroy do
diff --git a/spec/models/champ_spec.rb b/spec/models/champ_spec.rb
index 5a4f1d15c..aa4c20705 100644
--- a/spec/models/champ_spec.rb
+++ b/spec/models/champ_spec.rb
@@ -13,6 +13,15 @@ describe Champ do
     it { expect(champ.private?).to be_falsey }
   end
 
+  describe '#public_only' do
+    let(:dossier) { create(:dossier) }
+
+    it 'partition public and private' do
+      expect(dossier.champs.count).to eq(1)
+      expect(dossier.champs_private.count).to eq(1)
+    end
+  end
+
   describe '#format_datetime' do
     let(:type_de_champ) { build(:type_de_champ, type_champ: 'datetime') }
     let(:champ) { type_de_champ.champ.build(value: value) }
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index e7eb763f5..dda8fea66 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -4,4 +4,13 @@ describe TypeDeChamp do
   require 'models/type_de_champ_shared_example'
 
   it_should_behave_like "type_de_champ_spec"
+
+  describe '#public_only' do
+    let(:procedure) { create(:procedure, :with_type_de_champ, :with_type_de_champ_private) }
+
+    it 'partition public and private' do
+      expect(procedure.types_de_champ.count).to eq(1)
+      expect(procedure.types_de_champ_private.count).to eq(1)
+    end
+  end
 end