diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction
index 76687b668..03916ec19 100644
--- a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction
+++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction
@@ -4,4 +4,15 @@ function animated_java:omegaflowey_summitflowerbed/remove/all
 function animated_java:omegaflowey_summitpetalpipeleft/remove/all
 function animated_java:omegaflowey_summitpetalpiperight/remove/all
 function animated_java:omegaflowey_summitpetalpipetop/remove/all
-$execute as $(outside_tvscreen_uuid) run function animated_java:omegaflowey_tv_screen/remove/this
+# TAG_OUTSIDE_TVSCREEN_HARDCODED
+execute as @e[ \
+  x=-123.47, y=87.25, z=33.35, \
+  distance=..1, \
+  type=minecraft:item_display, \
+  tag=aj.omegaflowey_tv_screen.root, \
+  tag=!tv_screen.boss_fight, \
+  tag=!tv_screen.soul, \
+  tag=decorative, \
+  tag=omega-flowey-remastered, \
+  limit=1 \
+] run function animated_java:omegaflowey_tv_screen/remove/this
diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction
index 0bd5a72fd..892316244 100644
--- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction
+++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction
@@ -1,4 +1,5 @@
 # Flowey TV screen, smiling
+# TAG_OUTSIDE_TVSCREEN_HARDCODED
 scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 3
 execute positioned -123.47 87.25 33.35 rotated -158.2 12.52 run \
   function animated_java:omegaflowey_tv_screen/summon { args: { animation: 'omegaflowey_move_slow', start_animation: true, variant: 'smiling_noglow' } }