diff --git a/src/ParagraphsBehaviorBase.php b/src/ParagraphsBehaviorBase.php
index 28abd11..9348fb2 100644
--- a/src/ParagraphsBehaviorBase.php
+++ b/src/ParagraphsBehaviorBase.php
@@ -129,8 +129,8 @@ abstract class ParagraphsBehaviorBase extends PluginBase implements ParagraphsBe
   /**
    * {@inheritdoc}
    */
-  public function submitBehaviorForm(ParagraphInterface $paragraph, array &$form, FormStateInterface $form_state) {
-    $paragraph->setBehaviorSettings($this->getPluginId(), $form_state->getValues());
+  public function submitBehaviorForm(Paragraph $paragraphs_entity, array $values) {
+    $paragraphs_entity->setBehaviorSettings($this->getPluginId(), $values);
   }
 
   /**
diff --git a/src/ParagraphsBehaviorInterface.php b/src/ParagraphsBehaviorInterface.php
index 90d782f..4bca27a 100644
--- a/src/ParagraphsBehaviorInterface.php
+++ b/src/ParagraphsBehaviorInterface.php
@@ -57,14 +57,12 @@ interface ParagraphsBehaviorInterface extends PluginFormInterface, ConfigurableP
    * This method is responsible for submitting the data and saving it in the
    * paragraphs entity.
    *
-   * @param \Drupal\paragraphs\ParagraphInterface $paragraph
-   *   The paragraph.
-   * @param array $form
-   *   An associative array containing the initial structure of the plugin form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
+   *  @param \Drupal\paragraphs\Entity\Paragraph $paragraphs_entity
+   *   The paragraphs entity.
+   * @param array $values
+   *   The values taken from the form.
    */
-  public function submitBehaviorForm(ParagraphInterface $paragraph, array &$form, FormStateInterface $form_state);
+  public function submitBehaviorForm(Paragraph $paragraphs_entity, array $values);
 
   /**
    * Adds a default set of helper variables for preprocessors and templates.
diff --git a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
index a82ee34..fbc3dfa 100644
--- a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php
@@ -1356,12 +1356,7 @@ class ParagraphsWidget extends WidgetBase {
             if (!isset($item['behavior_plugins'][$plugin_id])) {
               $item['behavior_plugins'][$plugin_id] = [];
             }
-            if (isset($element[$delta]) && isset($element[$delta]['behavior_plugins'][$plugin_id]) && $form_state->getCompleteForm() && \Drupal::currentUser()->hasPermission('edit behavior plugin settings')) {
-              $subform_state = SubformState::createForSubform($element[$delta]['behavior_plugins'][$plugin_id], $form_state->getCompleteForm(), $form_state);
-              if (isset($item['behavior_plugins'][$plugin_id])) {
-                $plugin_values->submitBehaviorForm($paragraphs_entity, $item['behavior_plugins'][$plugin_id], $subform_state);
-              }
-            }
+            $plugin_values->submitBehaviorForm($paragraphs_entity, $item['behavior_plugins'][$plugin_id]);
           }
         }
 
diff --git a/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php b/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
index 6069e29..cecd6a6 100644
--- a/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
+++ b/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
@@ -297,10 +297,14 @@ class ParagraphsExperimentalBehaviorsTest extends ParagraphsExperimentalTestBase
     $this->clickLink('Edit');
     $edit = [
       'field_paragraphs[0][_weight]' => 1,
+      'field_paragraphs[1][behavior_plugins][test_bold_text][bold_text]' => FALSE,
+      'field_paragraphs[1][behavior_plugins][test_text_color][text_color]' => 'red',
       'field_paragraphs[1][_weight]' => 0,
     ];
     $this->drupalPostFormSave(NULL, $edit, t('Save and keep published'), t('Save'));
     $this->assertNoErrorsLogged();
+    $this->clickLink('Edit');
+    $this->assertFieldByName('field_paragraphs[0][behavior_plugins][test_text_color][text_color]', 'red');
 
   }
 }