diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
index e0c9a16c2994759bbd8370ee218c7e3c8f866d13..ed8ad79708e4146938d61ef15e85d5406e03756c 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
@@ -595,7 +595,8 @@ public class PointOfInterestController extends HttpServlet {
                         {
                             FormValidation formValidation = FormValidator.validateForm("poiForm", request, getServletContext());
                             Boolean poiNameAlreadyExists = SessionControllerGetter.getPointOfInterestBean().getPointOfInterest(formValidation.getFormField("name").getWebValue()) != null;
-                            if(formValidation.isValid() && ! poiNameAlreadyExists)
+                            // Only store if valid form data and NOT a new poi with an existing poiName
+                            if(formValidation.isValid() && !(poi.getPointOfInterestId() == null && poiNameAlreadyExists))
                             {
                                 // Set values
                                 poi.setName(formValidation.getFormField("name").getWebValue());