diff --git a/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java b/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java
index 693cd1f..5f22d5b 100644
--- a/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java
+++ b/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java
@@ -29,6 +29,9 @@ import java.util.List;
 public class SWUtils {
 
     public static void giveItemToPlayer(Player player, ItemStack itemStack) {
+        if (itemStack == null || itemStack.getType() == Material.AIR) {
+            return;
+        }
         for (int i = 0; i < player.getInventory().getSize(); i++) {
             ItemStack current = player.getInventory().getItem(i);
             if (current != null && current.isSimilar(itemStack)) {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 337ea4a..f946b96 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -102,6 +102,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         Bukkit.getPluginManager().registerEvents(new TNTSimulatorListener(), this);
         Bukkit.getPluginManager().registerEvents(new CommandGUI(), this);
         Bukkit.getPluginManager().registerEvents(new DetonatorListener(), this);
+        Bukkit.getPluginManager().registerEvents(new ItemFrameListener(), this);
         VersionedRunnable.call(new VersionedRunnable(() -> Bukkit.getPluginManager().registerEvents(new RedstoneListener(), this), 15));
         new AFKStopper();
 
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java
new file mode 100644
index 0000000..a8c9618
--- /dev/null
+++ b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java
@@ -0,0 +1,52 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.world;
+
+import de.steamwar.bausystem.SWUtils;
+import org.bukkit.Material;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class ItemFrameListener implements Listener {
+
+    @EventHandler
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Player)) {
+            return;
+        }
+        if (!(event.getEntity() instanceof ItemFrame)) {
+            return;
+        }
+        event.setCancelled(true);
+        ItemFrame itemFrame = (ItemFrame) event.getEntity();
+        ItemStack itemStack = itemFrame.getItem();
+        if (itemStack.getType() != Material.AIR) {
+            SWUtils.giveItemToPlayer((Player) event.getDamager(), itemFrame.getItem());
+            itemFrame.setItem(null);
+        } else {
+            itemFrame.remove();
+        }
+    }
+
+}