diff --git a/gsk/ngl/gsknglrenderjob.c b/gsk/ngl/gsknglrenderjob.c
index b876e6e248..3f36d506ab 100644
--- a/gsk/ngl/gsknglrenderjob.c
+++ b/gsk/ngl/gsknglrenderjob.c
@@ -1373,11 +1373,16 @@ static inline void
 gsk_ngl_render_job_visit_color_node (GskNglRenderJob     *job,
                                      const GskRenderNode *node)
 {
+  const GdkRGBA *rgba;
   guint16 color[4];
   GskNglProgram *program;
   GskNglCommandBatch *batch;
 
-  rgba_to_half (gsk_color_node_get_color (node), color);
+  rgba = gsk_color_node_get_color (node);
+  if (gdk_rgba_is_clear (rgba))
+    return;
+
+  rgba_to_half (rgba, color);
 
   /* Avoid switching away from the coloring program for
    * rendering a solid color.
@@ -2845,7 +2850,12 @@ gsk_ngl_render_job_visit_text_node (GskNglRenderJob     *job,
    * We tell the shader by setting the color to vec4(-1).
    */
   if (force_color || !gsk_text_node_has_color_glyphs (node))
-    rgba_to_half (color, c);
+    {
+      if (gdk_rgba_is_clear (color))
+        return;
+
+      rgba_to_half (color, c);
+    }
 
   lookup.font = (PangoFont *)font;
   lookup.scale = (guint) (text_scale * 1024);
diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c
index af8608b682..5ebb37f14f 100644
--- a/gtk/gtksnapshot.c
+++ b/gtk/gtksnapshot.c
@@ -30,6 +30,8 @@
 #include "gtkstylecontextprivate.h"
 #include "gsktransformprivate.h"
 
+#include "gdk/gdkrgbaprivate.h"
+
 #include "gsk/gskrendernodeprivate.h"
 #include "gsk/gskroundedrectprivate.h"
 
@@ -461,8 +463,12 @@ gtk_snapshot_collect_opacity (GtkSnapshot      *snapshot,
     }
   else if (state->data.opacity.opacity == 0.0)
     {
+      GdkRGBA color = GDK_RGBA ("00000000");
+      graphene_rect_t bounds;
+
+      gsk_render_node_get_bounds (node, &bounds);
+      opacity_node = gsk_color_node_new (&color, &bounds);
       gsk_render_node_unref (node);
-      opacity_node = NULL;
     }
   else
     {