diff --git a/app/models/issue.rb b/app/models/issue.rb
index ee317b006..48a3730fc 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -2020,7 +2020,7 @@ class Issue < ApplicationRecord
   # Make sure updated_on is updated when adding a note and set updated_on now
   # so we can set closed_on with the same value on closing
   def force_updated_on_change
-    if @current_journal || changed?
+    if changed? || (@current_journal && !@current_journal.notes_and_details_empty?)
       self.updated_on = current_time_from_proper_timezone
       if new_record?
         self.created_on = updated_on
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 12f2beec8..816f434a2 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -102,7 +102,11 @@ class Journal < ApplicationRecord
   def save(*args)
     journalize_changes
     # Do not save an empty journal
-    (details.empty? && notes.blank?) ? false : super()
+    notes_and_details_empty? ? false : super()
+  end
+
+  def notes_and_details_empty?
+    notes.blank? && details.empty?
   end
 
   def journalized