diff --git a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
index 75e66351..95f6f9ab 100644
--- a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
+++ b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
@@ -516,6 +516,7 @@ sub generate_singularity {
     if ($building->is_working) {
         confess [1010, 'The Black Hole Generator is cooling down from the last use.'];
     }
+    $building->start_work({}, 600)->update;
     unless (defined $target) {
         confess [1002, 'Could not locate target.'];
     }
@@ -702,7 +703,11 @@ sub generate_singularity {
     }
     
     $body->spend_waste($task->{waste_cost})->update;
-    $building->start_work({}, $task->{recovery})->update;
+#    $building->start_work({}, $task->{recovery})->update;
+    my $work_ends = DateTime->now;
+    $work_ends->add(seconds => $task->{recovery});
+    $building->reschedule_work($work_ends);
+    $building->update;
     # Pass the basic checks
     # Check for startup failure
     my $roll = randint(0,99);
diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt
index 8e547b44..e66dfaec 100644
--- a/var/www/public/changes.txt
+++ b/var/www/public/changes.txt
@@ -6,6 +6,7 @@
  - Fix: Supply Chains to Space Stations are halted if supplier leaves alliance.
  - Mod: If alliance leader quits game, alliance leadership is transferred.
  - Mod: If a member of an alliance leaves, space stations of member turned over to leader of alliance.
+ - Fix: BHG cooldown time of 5 minutes during warmup.
 
 3.0892:
  - Fix: Fix schedule to remove past jobs when rescheduling.