diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/OrganisationController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/OrganisationController.java
index f6e5be2..7c200b4 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/OrganisationController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/OrganisationController.java
@@ -91,8 +91,19 @@
 	 * @throws HttpStatusException
 	 */
 	public OrganisationDto saveOrganisation(OrganisationDto organisationDto) {
-		Organisation organisation = (Organisation) entityConverter.convertDtoToEntity(organisationDto,
-				new Organisation());
+
+		Organisation dbOrga = null;
+		if (organisationDto.getId() != null) {
+			// check if organisation is existing.
+			dbOrga = organisationRepository.findOne(organisationDto.getId());
+		}
+
+		if (dbOrga == null) {
+			// if entity is not existing in db. a new one is getting created.
+			dbOrga = new Organisation();
+		}
+
+		Organisation organisation = (Organisation) entityConverter.convertDtoToEntity(organisationDto, dbOrga);
 
 		organisation = organisationRepository.save(organisation);
 
