diff --git a/src/term.c b/src/term.c
index 9c28741..b7e3fac 100644
--- a/src/term.c
+++ b/src/term.c
@@ -153,7 +153,7 @@
 
 // The t_8u code may default to a value but get reset when the term response is
 // received.  To avoid redrawing too often, only redraw when t_8u is not reset
-// and it was supposed to be written.
+// and it was supposed to be written.  Unless t_8u was set explicitly.
 // FALSE -> don't output t_8u yet
 // MAYBE -> tried outputing t_8u while FALSE
 // OK    -> can write t_8u
@@ -3011,7 +3011,10 @@
 term_ul_rgb_color(guicolor_T rgb)
 {
 # ifdef FEAT_TERMRESPONSE
-    if (write_t_8u_state != OK)
+    // If the user explicitly sets t_8u then use it.  Otherwise wait for
+    // termresponse to be received, which is when t_8u would be set and a
+    // redraw is needed if it was used.
+    if (!option_was_set((char_u *)"t_8u") && write_t_8u_state != OK)
 	write_t_8u_state = MAYBE;
     else
 # endif
diff --git a/src/version.c b/src/version.c
index 571eef2..2534e06 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    636,
+/**/
     635,
 /**/
     634,