diff --git a/src/content/loading/BlockLoader.cpp b/src/content/loading/BlockLoader.cpp
index a8615e3f2..6866443bc 100644
--- a/src/content/loading/BlockLoader.cpp
+++ b/src/content/loading/BlockLoader.cpp
@@ -247,5 +247,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
     if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
         def.pickingItem = CORE_EMPTY;
     }
-    def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua";
+    if (root.has("script-name") || def.scriptFile.empty()) {
+        def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua";
+    }
 }
diff --git a/src/voxels/blocks_agent.cpp b/src/voxels/blocks_agent.cpp
index ea668f8e6..46fae323c 100644
--- a/src/voxels/blocks_agent.cpp
+++ b/src/voxels/blocks_agent.cpp
@@ -160,12 +160,6 @@ static void initialize_block(
     block_register_events.push_back(BlockRegisterEvent {
         static_cast<uint8_t>(bits | 1), def.rt.id, {x, y, z}
     });
-
-    if (def.rt.funcsset.onblocktick) {
-        block_register_events.push_back(BlockRegisterEvent {
-            bits, def.rt.id, {x, y, z}
-        });
-    }
 }
 
 template <class Storage>