diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java
index fb6104fceec616f3947d6f05469f7b230e744336..508d3d6962e5f56fe217b7c30327cd60f6893479 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java
@@ -108,6 +108,7 @@ public class Project {
 				}
 			}
 		}
+
 		Page page = pages.get(index.getPagePosition());
 		page.setPad(index.getId(), pad);
 	}
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java
index 20c1d326a74f4f072f940aca94e5e8f88fcc73ed..28e271d7fb862d9737bf89109fd50f49a1aef5a4 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java
@@ -205,9 +205,8 @@ public class Page implements Cloneable {
 	 * @param pad pad
 	 */
 	public void setPad(int id, Pad pad) {
-		if (pad == null) {
-			pads.removeIf(p -> p.getPosition() == id);
-		} else {
+		pads.removeIf(p -> p.getPosition() == id);
+		if (pad != null) {
 			pads.add(pad);
 			pad.setPage(this);
 			pad.setPosition(id);