diff --git a/worlds/sm/Options.py b/worlds/sm/Options.py
index dc696a74..07f79f17 100644
--- a/worlds/sm/Options.py
+++ b/worlds/sm/Options.py
@@ -224,7 +224,6 @@ class VariaCustomPreset(OptionList):
     display_name = "Varia Custom Preset"  
     default = {}
 
-
 sm_options: typing.Dict[str, type(Option)] = {
     "start_inventory_removes_from_pool": StartItemsRemovesFromPool,
     "preset": Preset,
@@ -275,5 +274,5 @@ sm_options: typing.Dict[str, type(Option)] = {
     "no_music": NoMusic,
     "random_music": RandomMusic,
     "custom_preset": CustomPreset,
-    "varia_custom_preset": VariaCustomPreset
+    "varia_custom_preset": VariaCustomPreset,
     }
diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index 0938da8a..421a6bb4 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -69,7 +69,6 @@ class SMWorld(World):
     itemManager: ItemManager
 
     locations = {}
-    hint_blacklist = {'Nothing', 'No Energy'}
 
     Logic.factory('vanilla')
 
@@ -531,6 +530,8 @@ class SMWorld(World):
         for item in self.world.itempool:
             if item.player == self.player and item.advancement:
                 progitempool.append(item)
+            if item.location.player == self.player and item.game == "Super Metroid" and item.type == "Nothing":
+                item.location.address = None
 
         for item in progitempool:
             new_state.collect(item, True)