diff --git a/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
index 8cda825..7eca020 100644
--- a/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
@@ -303,7 +303,7 @@ class ContentEntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPlugin
     foreach (array_keys($entity_types) as $delta => $type) {
       $class = $this->entityManager->getDefinition($type)->getClass();
       if (is_subclass_of($class, '\Drupal\Core\Entity\FieldableEntityInterface', TRUE)) {
-        $options[] = array_values($entity_types)[$delta];
+        $options[array_keys($entity_types)[$delta]] = array_values($entity_types)[$delta];
       };
     }
 
diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 1bc966c..0019308 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -183,8 +183,6 @@ class MonitoringUITest extends MonitoringTestBase {
    * Tests the entity aggregator sensors.
    *
    * Tests the entity aggregator with time interval settings and verbosity.
-   *
-   * @todo add tests for DB aggregator.
    */
   public function testAggregateSensorTimeIntervalConfig() {
     $account = $this->drupalCreateUser(array('administer monitoring', 'monitoring reports', 'monitoring reports'));