diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index fcaaf46b8..742c51b2e 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -2801,6 +2801,12 @@ _cairo_gradient_pattern_fit_to_range (const cairo_gradient_pattern_t *gradient,
 	dim = MAX (dim, fabs (radial->cd1.center.y - radial->cd2.center.y));
 	dim = MAX (dim, fabs (radial->cd1.radius   - radial->cd2.radius));
     }
+    dim = MAX (dim, fabs (gradient->base.matrix.xx));
+    dim = MAX (dim, fabs (gradient->base.matrix.xy));
+    dim = MAX (dim, fabs (gradient->base.matrix.x0));
+    dim = MAX (dim, fabs (gradient->base.matrix.yx));
+    dim = MAX (dim, fabs (gradient->base.matrix.yy));
+    dim = MAX (dim, fabs (gradient->base.matrix.y0));
 
     if (unlikely (dim > max_value)) {
 	cairo_matrix_t scale;
diff --git a/test/gradient-scale-crash.c b/test/gradient-scale-crash.c
new file mode 100644
index 000000000..b265e429b
--- /dev/null
+++ b/test/gradient-scale-crash.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2024 Koichi Akabe
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Koichi Akabe <vbkaisetsu@gmail.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_pattern_t *p = cairo_pattern_create_linear (0, 0, 0, 100);
+
+    cairo_pattern_add_color_stop_rgb (p, 0, 1, 1, 1);
+    cairo_pattern_add_color_stop_rgb (p, 1, 1, 0, 0);
+
+    cairo_matrix_t m;
+    cairo_matrix_init (&m, 100000, 0, 0, 100000, 0, 0);
+    cairo_pattern_set_matrix (p, &m);
+
+    cairo_set_source (cr, p);
+    cairo_rectangle (cr, 0, 0, 100, 100);
+    cairo_paint (cr);
+
+    cairo_pattern_destroy (p);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (gradient_scale_crash,
+	    "Verify fix for https://gitlab.freedesktop.org/cairo/cairo/-/issues/789",
+	    "gradient, pattern", /* keywords */
+	    NULL, /* requirements */
+	    0, 0,
+	    NULL, draw)
diff --git a/test/meson.build b/test/meson.build
index d7834438f..dff2f2efe 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -160,6 +160,7 @@ test_sources = [
   'get-path-extents.c',
   'gradient-alpha.c',
   'gradient-constant-alpha.c',
+  'gradient-scale-crash.c',
   'gradient-zero-stops.c',
   'gradient-zero-stops-mask.c',
   'group-clip.c',