diff --git a/src/EventSubscriber/UwWebformPreSaveEventSubscriber.php b/src/EventSubscriber/UwWebformPreSaveEventSubscriber.php
new file mode 100644
index 0000000000000000000000000000000000000000..f5b307ab113efe09a43818c3180ccfde64b0f821
--- /dev/null
+++ b/src/EventSubscriber/UwWebformPreSaveEventSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\uw_cfg_common\EventSubscriber;
+
+use Drupal\core_event_dispatcher\EntityHookEvents;
+use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent;
+use Drupal\webform\WebformInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Fixes roles permission for submission create for webforms.
+ */
+class UwWebformPreSaveEventSubscriber implements EventSubscriberInterface {
+
+  /**
+   * {@inheritDoc}
+   */
+  public static function getSubscribedEvents(): array {
+    return [
+      EntityHookEvents::ENTITY_PRE_SAVE => 'preSave',
+    ];
+  }
+
+  /**
+   * Entity pre save dispatched event.
+   *
+   * @param \Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent $event
+   *   Event object.
+   */
+  public function preSave(EntityPresaveEvent $event): void {
+    $entity = $event->getEntity();
+
+    if ($entity->bundle() === 'webform') {
+      /** @var \Drupal\webform\Entity\Webform $entity */
+      $access_rules = $entity->getAccessRules();
+
+      // Update webform submission access roles to be anonymous and
+      // authenticated. This will be done on EVERY webform save.
+      // Fixes migration issue with webforms. Once migration is updated and
+      // fixed, this code is no longer needed and can be removed.
+      $access_rules['create']['roles'] = [
+        'anonymous',
+        'authenticated',
+      ];
+
+      $entity->setAccessRules($access_rules);
+
+      // Setting default access denied handler.
+      $entity->setSetting('form_access_denied', WebformInterface::ACCESS_DENIED_PAGE);
+    }
+  }
+
+}
diff --git a/uw_cfg_common.services.yml b/uw_cfg_common.services.yml
index 28b61b8481a2f13712ad66e001f919d78e633167..8b0ca3cc56bb843dad2fabb9966eb383a859504b 100644
--- a/uw_cfg_common.services.yml
+++ b/uw_cfg_common.services.yml
@@ -45,3 +45,7 @@ services:
   uw_cfg_common.missing_blocks:
     class: Drupal\uw_cfg_common\Service\UWMissingBlocks
     arguments: ['@entity_type.manager', '@keyvalue.expirable', '@layout_builder.tempstore_repository']
+  uw_cfg_common.webform_save.event_subscriber:
+    class: '\Drupal\uw_cfg_common\EventSubscriber\UwWebformPreSaveEventSubscriber'
+    tags:
+      - { name: 'event_subscriber' }