diff --git a/x11-terms/kitty/kitty-0.24.0.ebuild b/x11-terms/kitty/kitty-0.24.0.ebuild
index dd602a0940371..e110c82bbd0b9 100644
--- a/x11-terms/kitty/kitty-0.24.0.ebuild
+++ b/x11-terms/kitty/kitty-0.24.0.ebuild
@@ -73,8 +73,7 @@ src_prepare() {
 
 	# --shell-integration="enabled no-rc" is the intended way to set
 	# no-rc by default, but setup.py's replacer currently fails
-	# (no-rc prevents modifying users .bashrc without asking, and it's
-	# unnecessary given shell-integration package uses /etc/bash/bashrc.d)
+	# https://github.com/kovidgoyal/kitty/issues/4434
 	sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die
 
 	# test relies on 'who' command which typically works but have 1 VM
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index dd602a0940371..a0d732aca31a8 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -71,12 +71,6 @@ src_prepare() {
 		-i kitty_tests/check_build.py || die
 	use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die
 
-	# --shell-integration="enabled no-rc" is the intended way to set
-	# no-rc by default, but setup.py's replacer currently fails
-	# (no-rc prevents modifying users .bashrc without asking, and it's
-	# unnecessary given shell-integration package uses /etc/bash/bashrc.d)
-	sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die
-
 	# test relies on 'who' command which typically works but have 1 VM
 	# where it didn't only under portage/sandbox, needs investigation but
 	# disable for now
@@ -95,6 +89,7 @@ src_compile() {
 		--disable-link-time-optimization
 		--ignore-compiler-warnings
 		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc"
 		--update-check-interval=0
 		--verbose
 		$(usev debug --debug)