diff --git a/CHANGELOG.md b/CHANGELOG.md
index da28d1870..e46e25bc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cleaned up `IndividualTimeSeriesMetaInformation`-related methods in `CsvFileConnector` [#544](https://github.com/ie3-institute/PowerSystemDataModel/issues/544)
 - Fixed spotlessApply handling for `.groovy` files [#637](https://github.com/ie3-institute/PowerSystemDataModel/issues/637)
 - Re-using SQL connection per default [#653](https://github.com/ie3-institute/PowerSystemDataModel/issues/653)
+- Persisting EmInputs [#665](https://github.com/ie3-institute/PowerSystemDataModel/issues/665)
 
 ### Changed
 - BREAKING: PvInput Model parameter name height changed to elevationAngle [#393](https://github.com/ie3-institute/PowerSystemDataModel/issues/393) :warning:
diff --git a/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java b/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java
index 399f33e3a..46839c364 100644
--- a/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java
+++ b/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java
@@ -192,6 +192,7 @@ public void persistJointGrid(JointGridContainer jointGridContainer) {
     Set<PvInput> pvPlants = systemParticipants.getPvPlants();
     Set<StorageInput> storages = systemParticipants.getStorages();
     Set<WecInput> wecPlants = systemParticipants.getWecPlants();
+    Set<EmInput> emSystems = systemParticipants.getEmSystems();
 
     // get graphic elements (just for better readability, we could also just get them directly
     // below)
@@ -231,7 +232,8 @@ public void persistJointGrid(JointGridContainer jointGridContainer) {
                 loads,
                 pvPlants,
                 storages,
-                wecPlants)
+                wecPlants,
+                emSystems)
             .flatMap(Collection::stream)
             .map(Extractor::extractOperator)
             .flatMap(Optional::stream)
diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java
index f08be2cd3..9cf96d239 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java
@@ -106,7 +106,7 @@ public SystemParticipants(Collection<SystemParticipants> systemParticipants) {
   /**
    * Create an instance based on a list of {@link SystemParticipantInput} entities
    *
-   * @param systemParticipants list of system participants this container instance should created
+   * @param systemParticipants list of system participants this container instance should be created
    *     from
    */
   public SystemParticipants(List<SystemParticipantInput> systemParticipants) {
@@ -182,6 +182,7 @@ public final List<SystemParticipantInput> allEntitiesAsList() {
     allEntities.addAll(pvPlants);
     allEntities.addAll(storages);
     allEntities.addAll(wecPlants);
+    allEntities.addAll(emSystems);
     return Collections.unmodifiableList(allEntities);
   }
 
@@ -205,7 +206,7 @@ public Set<EvInput> getEvs() {
     return evs;
   }
 
-  /** @return unmodifiable Set of all fixed feed in in this grid */
+  /** @return unmodifiable Set of all fixed feed in this grid */
   public Set<FixedFeedInInput> getFixedFeedIns() {
     return Collections.unmodifiableSet(fixedFeedIns);
   }
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy
index 81ac6e7a9..cb3a28799 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy
@@ -44,7 +44,7 @@ class CsvSystemParticipantSourceTest extends Specification implements CsvTestDat
     then:
     systemParticipantsOpt.present
     systemParticipantsOpt.ifPresent({ systemParticipants ->
-      assert (systemParticipants.allEntitiesAsList().size() == 10)
+      assert (systemParticipants.allEntitiesAsList().size() == 11)
       assert (systemParticipants.getPvPlants().first().uuid == sptd.pvInput.uuid)
       assert (systemParticipants.getBmPlants().first().uuid == sptd.bmInput.uuid)
       assert (systemParticipants.getChpPlants().first().uuid == sptd.chpInput.uuid)