diff --git a/git-gui.sh b/git-gui.sh
index c190cbe23f0c67f3866311506e4c5eaf47c87e80..8d95dda953fb3eb69cb4697a78ccea8e146a7839 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3894,7 +3894,7 @@ after 1 {
 		$ui_comm configure -state disabled -background gray
 	}
 }
-if {[is_enabled multicommit]} {
+if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} {
 	after 1000 hint_gc
 }
 if {[is_enabled retcode]} {