diff --git a/app/Livewire/Project/Database/Heading.php b/app/Livewire/Project/Database/Heading.php
index a9783d911..d1da60469 100644
--- a/app/Livewire/Project/Database/Heading.php
+++ b/app/Livewire/Project/Database/Heading.php
@@ -33,7 +33,10 @@ class Heading extends Component
     public function activityFinished()
     {
         try {
-            $this->database->started_at ??= now();
+            // Only set started_at if database is actually running
+            if ($this->database->isRunning()) {
+                $this->database->started_at ??= now();
+            }
             $this->database->save();
 
             if (is_null($this->database->config_hash) || $this->database->isConfigurationChanged()) {