diff --git a/Content.Server/_NF/Smuggling/Components/StationDeadDropHintExemptComponent.cs b/Content.Server/_NF/Smuggling/Components/StationDeadDropHintExemptComponent.cs
index 6e9ebeddaf8..42fac91eb0c 100644
--- a/Content.Server/_NF/Smuggling/Components/StationDeadDropHintExemptComponent.cs
+++ b/Content.Server/_NF/Smuggling/Components/StationDeadDropHintExemptComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server._NF.Smuggling.Components;
 
 /// <summary>
-///     A station that has this will not have hint spawn on it.
+///     A station that has this will not have round-start dead drop hints spawn on it.
 /// </summary>
 [RegisterComponent]
 public sealed partial class StationDeadDropHintExemptComponent : Component;
diff --git a/Resources/Prototypes/_NF/Entities/Stations/base.yml b/Resources/Prototypes/_NF/Entities/Stations/base.yml
index c9855c073ea..095ae40c758 100644
--- a/Resources/Prototypes/_NF/Entities/Stations/base.yml
+++ b/Resources/Prototypes/_NF/Entities/Stations/base.yml
@@ -108,3 +108,9 @@
   components:
     - type: StationDeadDrop
       maxDeadDrops: 2 # A few to be stumbled upon.
+
+- type: entity
+  id: BaseStationDeadDropHintExempt
+  abstract: true
+  components:
+    - type: StationDeadDropHintExempt
diff --git a/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
index 62c08677f48..51e8a09a60c 100644
--- a/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
@@ -12,10 +12,10 @@
   - BaseStationMail # Mail
   - BaseStationSectorServices # Hosts all sector-wide services
   - BaseStationDampening
+  - BaseStationDeadDropHintExempt # No hints
   categories: [ HideSpawnMenu ]
   components:
   - type: Transform
-  - type: StationDeadDropHintExempt
 
 - type: entity
   id: StandardFrontierOutpost
@@ -90,6 +90,7 @@
   - BaseStationRenameFaxes
   - BaseStationRenameWarpPoints
   - BaseStationSiliconLawFrontierShips
+  - BaseStationDeadDropHintExempt # No hints on ship generation
   categories: [ HideSpawnMenu ]
   components:
   - type: Transform
@@ -105,6 +106,7 @@
   - BaseStationRenameFaxes
   - BaseStationRenameWarpPoints
   - BaseStationSiliconLawFrontierShips
+  - BaseStationDeadDropHintExempt # No hints on ship generation
   categories: [ HideSpawnMenu ]
   components:
   - type: Transform
@@ -112,18 +114,9 @@
 - type: entity
   id: StandardFrontierSecurityExpeditionVessel
   parent:
-  - BaseStation
-  - BaseStationJobsSpawning
-  - BaseStationRecords
-  - BaseStationAlertLevels
-  - BaseStationAllEventsEligible
-  - BaseStationRenameFaxes
-  - BaseStationRenameWarpPoints
-  - BaseStationSiliconLawFrontierShips
+  - StandardFrontierSecurityVessel
   - BaseStationExpeditions
   categories: [ HideSpawnMenu ]
-  components:
-  - type: Transform
 
 - type: entity
   id: StandardFrontierExpeditionVessel
@@ -131,5 +124,3 @@
   - StandardFrontierVessel
   - BaseStationExpeditions
   categories: [ HideSpawnMenu ]
-  components:
-  - type: Transform