diff --git a/meson.build b/meson.build
index 8ba9ea59..22039257 100644
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,7 @@ greeter_deps = [dbus_glib, gtk3, webkit2, x11]
 webext_deps = [webkit2_webext, lightdm_gobject]
 
 has_webkitgtk_2_14 = webkit2.version().version_compare('>=2.14')
+has_webkitgtk_2_14_4 = webkit2.version().version_compare('>=2.14.4')
 has_lightdm_1_19_2 = lightdm_gobject.version().version_compare('>=1.19.2')
 has_gtk_3_22 = gtk3.version().version_compare('>=3.22')
 
@@ -62,6 +63,10 @@ if has_webkitgtk_2_14
   conf.set('HAS_WEBKITGTK_2_14', has_webkitgtk_2_14)
 endif
 
+if has_webkitgtk_2_14_4
+  conf.set('HAS_WEBKITGTK_2_14_4', has_webkitgtk_2_14_4)
+endif
+
 if has_lightdm_1_19_2
   conf.set('HAS_LIGHTDM_1_19_2', has_lightdm_1_19_2)
 endif
diff --git a/src/greeter.c b/src/greeter.c
index a3e5f158..fae864e1 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -349,8 +349,10 @@ main(int argc, char **argv) {
 	/* https://goo.gl/vDFwFe */
 	g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);
 
-	/* Temporary workaround until fixed upstream: https://goo.gl/wFJ4v7 */
-	g_setenv("WEBKIT_DISABLE_COMPOSITING_MODE", "1", TRUE);
+	if ( HAS_WEBKITGTK_2_14 && ! HAS_WEBKITGTK_2_14_4 ) {
+		/* AC mode causes a lot of crashes in webkit2gtk versions 2.14.0 through 2.14.3: */
+		g_setenv("WEBKIT_DISABLE_COMPOSITING_MODE", "1", TRUE);
+	}
 
 	/* Initialize i18n */
 	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);