diff --git test/functional/issues_controller_test.rb test/functional/issues_controller_test.rb
index b52648f..4afd743 100644
--- test/functional/issues_controller_test.rb
+++ test/functional/issues_controller_test.rb
@@ -3213,7 +3213,8 @@ class IssuesControllerTest < ActionController::TestCase
 
     with_settings :notified_events => %w(issue_updated) do
       assert_difference('Journal.count') do
-        assert_difference('JournalDetail.count', 2) do
+        # Smile count + 1 #21623
+        assert_difference('JournalDetail.count', 3) do
           put :update, :id => 1, :issue => {:project_id => '1',
                                            :tracker_id => '2',
                                            :priority_id => '6'
@@ -3228,6 +3229,19 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 6, issue.priority_id
     assert_equal 1, issue.category_id
 
+    # Smile #21623 custom field value not present anymore because of tracker change
+    assert_equal nil, issue.custom_field_value(1)
+    last_journal_details = issue.journals.order('id desc').limit(1).first.details
+    assert_equal 3, last_journal_details.size
+
+    cf_2_journals = last_journal_details.select{|d|
+        d.property == 'cf' &&
+        d.prop_key == '2' &&
+        d.value == nil
+      }.collect{|d| d.old_value}
+    assert_equal ['125'], cf_2_journals
+    # END -- Smile #21623
+
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")