diff --git a/EventSubscriber/SnippetAreaInvalidationSubscriber.php b/EventSubscriber/SnippetAreaInvalidationSubscriber.php
deleted file mode 100644
index 05eb925..0000000
--- a/EventSubscriber/SnippetAreaInvalidationSubscriber.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of Sulu.
- *
- * (c) Sulu GmbH
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-namespace Sulu\Bundle\HeadlessBundle\EventSubscriber;
-
-use Sulu\Bundle\HttpCacheBundle\Cache\CacheManager;
-use Sulu\Bundle\SnippetBundle\Domain\Event\WebspaceDefaultSnippetModifiedEvent;
-use Sulu\Bundle\SnippetBundle\Domain\Event\WebspaceDefaultSnippetRemovedEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * @final
- *
- * @internal
- */
-class SnippetAreaInvalidationSubscriber implements EventSubscriberInterface
-{
-    /**
-     * @var CacheManager|null
-     */
-    private $cacheManager;
-
-    public function __construct(?CacheManager $cacheManager)
-    {
-        $this->cacheManager = $cacheManager;
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return [
-            WebspaceDefaultSnippetModifiedEvent::class => 'invalidateSnippetAreaOnModified',
-            WebspaceDefaultSnippetRemovedEvent::class => 'invalidateSnippetAreaOnRemoved',
-        ];
-    }
-
-    public function invalidateSnippetAreaOnModified(WebspaceDefaultSnippetModifiedEvent $event): void
-    {
-        $this->invalidateSnippetArea($event->getSnippetAreaKey());
-    }
-
-    public function invalidateSnippetAreaOnRemoved(WebspaceDefaultSnippetRemovedEvent $event): void
-    {
-        $this->invalidateSnippetArea($event->getSnippetAreaKey());
-    }
-
-    private function invalidateSnippetArea(string $snippetAreaKey): void
-    {
-        if (!$this->cacheManager) {
-            return;
-        }
-
-        $this->cacheManager->invalidateReference('snippet_area', $snippetAreaKey);
-    }
-}
diff --git a/Resources/config/controllers.xml b/Resources/config/controllers.xml
index 7aa850f..1758686 100644
--- a/Resources/config/controllers.xml
+++ b/Resources/config/controllers.xml
@@ -28,7 +28,7 @@
             <argument type="service" id="sulu.content.mapper"/>
             <argument type="service" id="sulu_headless.structure_resolver"/>
             <argument type="service" id="jms_serializer.serializer"/>
-            <argument type="service" id="sulu_headless.reference_store.snippet_area"/>
+            <argument type="service" id="sulu_snippet.reference_store.snippet_area"/>
             <argument>%sulu_http_cache.cache.max_age%</argument>
             <argument>%sulu_http_cache.cache.shared_max_age%</argument>
             <argument>%sulu_headless.snippet_area.cache_lifetime%</argument>
diff --git a/Resources/config/event-subscribers.xml b/Resources/config/event-subscribers.xml
index 01a04ad..48114d1 100644
--- a/Resources/config/event-subscribers.xml
+++ b/Resources/config/event-subscribers.xml
@@ -13,11 +13,5 @@
             <tag name="sulu_document_manager.event_subscriber"/>
             <tag name="kernel.reset" method="reset"/>
         </service>
-
-        <service id="sulu_headless.event_subscriber.snippet_area_invalidation" class="Sulu\Bundle\HeadlessBundle\EventSubscriber\SnippetAreaInvalidationSubscriber">
-            <argument type="service" id="sulu_http_cache.cache_manager" on-invalid="null"/>
-
-            <tag name="kernel.event_subscriber" />
-        </service>
     </services>
 </container>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 5bf7ada..bdde3b0 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -39,11 +39,5 @@
             <tag name="sulu_website.reference_store" alias="navigation"/>
             <tag name="kernel.reset" method="reset"/>
         </service>
-
-        <service id="sulu_headless.reference_store.snippet_area"
-                 class="Sulu\Bundle\WebsiteBundle\ReferenceStore\ReferenceStore">
-            <tag name="sulu_website.reference_store" alias="snippet_area"/>
-            <tag name="kernel.reset" method="reset"/>
-        </service>
     </services>
 </container>