diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index c9b454c737..f9bd7e15eb 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1694,7 +1694,10 @@ gtk_image_get_content_size (GtkCssGadget   *gadget,
     {
       baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget));
       *minimum = *natural = height;
-      *minimum_baseline = *natural_baseline = height * baseline_align;
+      if (minimum_baseline)
+        *minimum_baseline = height * baseline_align;
+      if (natural_baseline)
+        *natural_baseline = height * baseline_align;
     }
 
 }