diff --git a/connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java b/connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java
index 491356d5c..cb1ce9ad7 100644
--- a/connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java
+++ b/connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java
@@ -235,10 +235,13 @@ public class ItemRegistryPopulator {
             Set<String> javaOnlyItems = new ObjectOpenHashSet<>();
             Collections.addAll(javaOnlyItems, "minecraft:spectral_arrow", "minecraft:debug_stick",
                     "minecraft:knowledge_book", "minecraft:tipped_arrow", "minecraft:trader_llama_spawn_egg",
-                    "minecraft:bundle", "minecraft:sculk_sensor");
+                    "minecraft:bundle");
             if (!usingFurnaceMinecart) {
                 javaOnlyItems.add("minecraft:furnace_minecart");
             }
+            if (!GeyserConnector.getInstance().getConfig().isExtendedWorldHeight()) {
+                javaOnlyItems.add("minecraft:sculk_sensor");
+            }
             // Java-only items for this version
             javaOnlyItems.addAll(palette.getValue().getAdditionalTranslatedItems().keySet());
 
@@ -251,6 +254,9 @@ public class ItemRegistryPopulator {
                     // This items has a mapping specifically for this version of the game
                     mappingItem = entry.getValue();
                 }
+                if (entry.getKey().equals("minecraft:sculk_sensor") && GeyserConnector.getInstance().getConfig().isExtendedWorldHeight()) {
+                    mappingItem.setBedrockIdentifier("minecraft:sculk_sensor");
+                }
 
                 if (usingFurnaceMinecart && entry.getKey().equals("minecraft:furnace_minecart")) {
                     javaFurnaceMinecartId = itemIndex;
diff --git a/connector/src/main/resources/bedrock/creative_items.1_17_10.caves_and_cliffs.json b/connector/src/main/resources/bedrock/creative_items.1_17_10.caves_and_cliffs.json
index 00682415a..c085810e9 100644
--- a/connector/src/main/resources/bedrock/creative_items.1_17_10.caves_and_cliffs.json
+++ b/connector/src/main/resources/bedrock/creative_items.1_17_10.caves_and_cliffs.json
@@ -3137,9 +3137,6 @@
         {
             "id" : "minecraft:saddle"
         },
-        {
-            "id" : "minecraft:goat_horn"
-        },
         {
             "id" : "minecraft:leather_horse_armor"
         },