diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 6ec1e6ecd7..8700a65c6e 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -85,7 +85,7 @@
 		return
 
 	opacity = new_opacity
-	var/turf/T = loc
+	var/turf/T = isturf(src) ? src : loc
 	if(!isturf(T))
 		return
 
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index cc7c8c40bb..32ca92b311 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -82,7 +82,7 @@ var/list/mining_overlay_cache = list()
 /turf/simulated/mineral/proc/update_general()
 	update_icon(1)
 	if(ticker && ticker.current_state == GAME_STATE_PLAYING)
-		// TODO - Look into this
+		recalc_atom_opacity()
 		reconsider_lights()
 		if(air_master)
 			air_master.mark_for_update(src)