diff --git a/.forgejo/workflows/setup-ec2.yml b/.forgejo/workflows/setup-ec2.yml
index ead0fb0b..9c2dba06 100644
--- a/.forgejo/workflows/setup-ec2.yml
+++ b/.forgejo/workflows/setup-ec2.yml
@@ -77,7 +77,10 @@ jobs:
             # Setup Laravel environment file and key
             if [ ! -f .env ]; then
                 cp .env.example .env
-                php artisan key:generate
+            fi
+            
+            if grep -q "^APP_KEY=$" .env; then
+                php artisan key:generate --force
             fi
             
             # Ensure web server owns the files after composer finishes writing caches