diff --git a/inc/Framework.php b/inc/Framework.php
index 95267cc0..8c0a6661 100644
--- a/inc/Framework.php
+++ b/inc/Framework.php
@@ -8,6 +8,7 @@
 use BEA\Theme\Framework\Services\Assets_JS_Async;
 use BEA\Theme\Framework\Services\Editor;
 use BEA\Theme\Framework\Services\Editor_Patterns;
+use BEA\Theme\Framework\Services\Gravity_Forms;
 use BEA\Theme\Framework\Services\Menu;
 use BEA\Theme\Framework\Services\Sidebar;
 use BEA\Theme\Framework\Services\Svg;
@@ -37,6 +38,7 @@ class Framework {
 		Assets_JS_Async::class,
 		Editor::class,
 		Editor_Patterns::class,
+		Gravity_Forms::class,
 		Svg::class,
 		Acf::class,
 		Menu::class,
diff --git a/inc/Services/Gravity_Forms.php b/inc/Services/Gravity_Forms.php
new file mode 100644
index 00000000..4db0eab4
--- /dev/null
+++ b/inc/Services/Gravity_Forms.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace BEA\Theme\Framework\Services;
+
+use BEA\Theme\Framework\Service;
+use BEA\Theme\Framework\Service_Container;
+
+class Gravity_Forms implements Service {
+
+	public function register( Service_Container $container ): void {
+	}
+
+	public function boot( Service_Container $container ): void {
+		add_filter( 'gform_form_theme_slug', [ $this, 'gform_form_theme_slug' ], 10, 1 );
+	}
+
+	/**
+	 * Get service name
+	 *
+	 * @return string
+	 */
+	public function get_service_name(): string {
+		return 'gravity-forms';
+	}
+
+	/**
+	 * Force form default theme slug.
+	 *
+	 * @return string
+	 * @author Marie Comet
+	 */
+	public function gform_form_theme_slug(): string {
+		return 'gravity-theme';
+	}
+}