diff --git a/docs/changelog.rst b/docs/changelog.rst
index 10e8b4d0e..5be8440dd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -79,6 +79,8 @@ Detailed list of changes
 
 - Custom kittens: Add :ref:`a framework <kitten_main_rc>` for easily and securely using remote control from within a kitten's :code:`main()` function
 
+- kitten icat: Fix the :option:`kitty +kitten icat --no-trailing-newline` not working when using unicode placeholders (:iss:`7948`)
+
 0.36.4 [2024-09-27]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/kittens/icat/transmit.go b/kittens/icat/transmit.go
index d4556efff..3ec2b042c 100644
--- a/kittens/icat/transmit.go
+++ b/kittens/icat/transmit.go
@@ -272,7 +272,9 @@ func write_unicode_placeholder(imgd *image_data) {
 		for c := 0; c < imgd.width_cells; c++ {
 			os.Stdout.WriteString(string(kitty.ImagePlaceholderChar) + string(images.NumberToDiacritic[r]) + string(images.NumberToDiacritic[c]) + id_char)
 		}
-		os.Stdout.WriteString("\n\r")
+		if r < imgd.height_cells-1 {
+			os.Stdout.WriteString("\n\r")
+		}
 	}
 }