diff --git a/Resources/Maps/Shuttles/prowler.yml b/Resources/Maps/Shuttles/prowler.yml
index cde99be471b..d63128bd1f4 100644
--- a/Resources/Maps/Shuttles/prowler.yml
+++ b/Resources/Maps/Shuttles/prowler.yml
@@ -2506,7 +2506,7 @@ entities:
       pos: -8.5,1.5
       parent: 1
       type: Transform
-- proto: HyperlinkBookSpaceLaw
+- proto: BookRandomStory
   entities:
   - uid: 370
     components:
diff --git a/Resources/Maps/_NF/Shuttles/esquire.yml b/Resources/Maps/_NF/Shuttles/esquire.yml
index 34957b136b3..a2854a17c2f 100644
--- a/Resources/Maps/_NF/Shuttles/esquire.yml
+++ b/Resources/Maps/_NF/Shuttles/esquire.yml
@@ -2718,7 +2718,7 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: HyperlinkBookSpaceLaw
+- proto: BookRandomStory
   entities:
   - uid: 121
     components:
diff --git a/Resources/Maps/_NF/Shuttles/sprinter.yml b/Resources/Maps/_NF/Shuttles/sprinter.yml
index d389e59bf16..9745d4c0fc0 100644
--- a/Resources/Maps/_NF/Shuttles/sprinter.yml
+++ b/Resources/Maps/_NF/Shuttles/sprinter.yml
@@ -3907,7 +3907,7 @@ entities:
     - pos: -3.5,-11.5
       parent: 1
       type: Transform
-- proto: HyperlinkBookSpaceLaw
+- proto: BookRandomStory
   entities:
   - uid: 590
     components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index ecc2f72b47d..286ea86fddf 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -35,7 +35,7 @@
         tags:
         - Write
     bookSlot: # Frontier
-      startingItem: HyperlinkBookSpaceLaw
+      startingItem: BookRandomStory # HyperlinkBookSpaceLaw - hyperlink books broken, needs a fix
       priority: -2
       whitelist:
         tags:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
index b0f041eb7be..2d8e0b4d64d 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_security.yml
@@ -41,7 +41,7 @@
   components:
   - type: Mail
     contents:
-    - id: HyperlinkBookSpaceLaw
+    - id: BookRandomStory
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/books.yml
index e42fe4fdb5a..9b0800251e6 100644
--- a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/Random/books.yml
@@ -11,24 +11,5 @@
   - type: RandomSpawner
     offset: 0
     prototypes:
-      - HyperlinkBookSpaceLaw
-      - HyperlinkBookSupernanny
-      - HyperlinkBookChemistry
-      - HyperlinkBookBartending
-      - HyperlinkBookCooking
-      - HyperlinkBookBotany
-      - HyperlinkBookShuttle
-      - HyperlinkBookAlerts
-      - HyperlinkBookProcedure
-      - HyperlinkBookPower
-      - HyperlinkBookMedical
-      - HyperlinkBookHacking
-      - HyperlinkBookAtmos
-    chance: 0.9
-    rarePrototypes:
-      - BookChemistryInsane
-      - BookBotanicalTextbook
-      - BookGnominomicon
-      - BookFishing
-      - BookDetective
-    rareChance: 0.25
+      - BookRandomStory
+    chance: 1.0
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 6fc2b56f2b6..2eb7fef03cf 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -24,7 +24,7 @@
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
     ears: ClothingHeadsetSecurity
-    pocket1: HyperlinkBookSpaceLaw # Frontier
+    pocket1: BookRandomStory # HyperlinkBookSpaceLaw # Frontier - Hyperlink books broken needs a fix
   inhand:
     - BriefcaseBrownFilled
   innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack