diff --git a/plugins/endpoints/api/routes.py b/plugins/endpoints/api/routes.py
index e4ded727..1ce721be 100644
--- a/plugins/endpoints/api/routes.py
+++ b/plugins/endpoints/api/routes.py
@@ -4391,7 +4391,6 @@ def get_server_certificate():
 
 @endpoints_bp.route('/settings/server-cert/generate', methods=['POST'])
 @require_role('admin')
-@audit_log('endpoints.server_cert.generated')
 def generate_server_certificate():
     """Generate a new self-signed server certificate.
 
@@ -4494,6 +4493,13 @@ subjectAltName = @alt_names
         except Exception as restart_error:
             current_app.logger.error(f'Failed to restart nginx: {restart_error}')
 
+        # Audit log the certificate generation
+        try:
+            AuditLog.log(action='endpoints.server_cert.generated', userid=current_user.userid if current_user else None,
+                        details=f'Generated self-signed certificate: CN={cn}, SANs={san}, validity={days} days')
+        except Exception:
+            pass
+
         return success_response({
             'message': 'Certificate generated successfully. Nginx is restarting.'
         })
@@ -4518,7 +4524,6 @@ subjectAltName = @alt_names
 
 @endpoints_bp.route('/settings/server-cert/upload', methods=['POST'])
 @require_role('admin')
-@audit_log('endpoints.server_cert.uploaded')
 def upload_server_certificate():
     """Upload a new server certificate and private key.
 
@@ -4612,6 +4617,13 @@ def upload_server_certificate():
         except Exception as restart_error:
             current_app.logger.error(f'Failed to restart nginx: {restart_error}')
 
+        # Audit log the certificate upload
+        try:
+            AuditLog.log(action='endpoints.server_cert.uploaded', userid=current_user.userid if current_user else None,
+                        details=f'Uploaded CA-signed certificate from files: {cert_file.filename}, {key_file.filename}')
+        except Exception:
+            pass
+
         return success_response({
             'message': 'Certificate uploaded successfully. Nginx is restarting.'
         })