diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 0ed5162..9467a60 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -354,7 +354,7 @@ public function preSave(EntityStorageInterface $storage) {
   public function calculateDependencies() {
     // All dependencies should be recalculated on every save apart from enforced
     // dependencies. This ensures stale dependencies are never saved.
-    $this->dependencies = array_intersect_key($this->dependencies, ['enforced' => '']);
+    $this->dependencies = array_intersect_key($this->dependencies, ['enforced' => '', 'content' => '']);
     if ($this instanceof EntityWithPluginCollectionInterface) {
       // Configuration entities need to depend on the providers of any plugins
       // that they store the configuration for.
diff --git a/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.testblock.yml b/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.testblock.yml
new file mode 100644
index 0000000..07cd061
--- /dev/null
+++ b/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.testblock.yml
@@ -0,0 +1,24 @@
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:7297c945-457f-4b2c-8700-dc3052ab63ba'
+  module:
+    - block_content
+  theme:
+    - bartik
+id: testblock
+theme: bartik
+region: content
+weight: -8
+provider: null
+plugin: 'block_content:7297c945-457f-4b2c-8700-dc3052ab63ba'
+settings:
+  id: 'block_content:7297c945-457f-4b2c-8700-dc3052ab63ba'
+  label: 'Test Block'
+  provider: block_content
+  label_display: visible
+  status: true
+  info: ''
+  view_mode: full
+visibility: {  }
diff --git a/core/modules/block_content/tests/src/Kernel/BlockContentDependencyTest.php b/core/modules/block_content/tests/src/Kernel/BlockContentDependencyTest.php
new file mode 100644
index 0000000..7db3795
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/BlockContentDependencyTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\BlockContentDependencyTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel;
+
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+use Drupal\KernelTests\AssertConfigTrait;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @group block_content
+ */
+class BlockContentDependencyTest extends KernelTestBase {
+
+  use AssertConfigTrait;
+
+  /**
+   * An array of modules to enabled.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'block', 'block_content', 'block_content_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('block_content');
+    $this->installEntitySchema('block');
+    $this->installConfig(['block_content_test']);
+
+    BlockContent::create([
+      'uuid' => '7297c945-457f-4b2c-8700-dc3052ab63ba',
+      'type' => 'basic',
+    ])->save();
+  }
+
+  /**
+   * Test that dependencies are not removed upon import.
+   */
+  public function testBlockContentDependency() {
+    $config_name = 'block.block.testblock';
+    $default_install_path = drupal_get_path('module', 'block_content_test') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY;
+    $module_config_storage = new FileStorage($default_install_path, StorageInterface::DEFAULT_COLLECTION);
+
+    $result = $this->container->get('config.manager')
+      ->diff($module_config_storage, $this->container->get('config.storage'), $config_name);
+    $this->assertConfigDiff($result, $config_name, []);
+  }
+
+}