diff --git a/modules/security/malware-scanner.sh b/modules/security/malware-scanner.sh
index fa82686..2624704 100755
--- a/modules/security/malware-scanner.sh
+++ b/modules/security/malware-scanner.sh
@@ -825,30 +825,60 @@ for scanner in "${AVAILABLE_SCANNERS[@]}"; do
                     echo "  ⏳ Scanner: ImunifyAV (monitoring progress...)"
                     echo ""
 
-                    # Start scan in background
-                    imunify-antivirus malware on-demand start --path="$path" &>> "$LOG_DIR/imunify.log" &
-                    SCAN_PID=$!
+                    # Start scan (ImunifyAV runs async, command returns immediately)
+                    imunify-antivirus malware on-demand start --path="$path" &>> "$LOG_DIR/imunify.log"
+                    START_EXIT=$?
 
-                    # Monitor progress by polling scan list
-                    sleep 2  # Give scan time to start
+                    if [ $START_EXIT -ne 0 ]; then
+                        log_message "ERROR: ImunifyAV scan failed to start for $path (exit code: $START_EXIT)"
+                        echo "  ✗ Scan failed to start for $path (check logs)"
+                        continue
+                    fi
+
+                    # Monitor progress by polling scan status
+                    # ImunifyAV runs scans asynchronously, we poll the status
+                    sleep 3  # Give scan time to initialize
                     last_count=0
                     timeout_counter=0
                     max_timeout=7200  # 2 hour timeout
+                    scan_running=true
 
-                    while kill -0 $SCAN_PID 2>/dev/null; do
-                        # Get current scan status
+                    while [ "$scan_running" = true ]; do
+                        # Get current scan status from most recent scan
                         scan_info=$(imunify-antivirus malware on-demand list 2>/dev/null | tail -n +2 | head -1)
+
                         if [ -n "$scan_info" ]; then
                             current_files=$(echo "$scan_info" | awk '{print $11}')
-                            status=$(echo "$scan_info" | awk '{print $2}')
+                            current_status=$(echo "$scan_info" | awk '{print $7}')  # Field 7 is SCAN_STATUS
+                            created_time=$(echo "$scan_info" | awk '{print $2}')  # Field 2 is CREATED
 
-                            if [[ "$current_files" =~ ^[0-9]+$ ]]; then
-                                if [ "$current_files" != "$last_count" ]; then
-                                    elapsed=$(($(date +%s) - SCAN_START))
-                                    printf "\r  Files scanned: %s | Elapsed: %s | Status: %s  " \
-                                        "$current_files" "$(format_time $elapsed)" "$status"
-                                    last_count=$current_files
-                                    timeout_counter=0
+                            # Check if this is our scan (created after scan start)
+                            if [ "$created_time" -ge "$SCAN_START" ]; then
+                                # Check status
+                                if [[ "$current_status" =~ ^(completed|stopped|failed)$ ]]; then
+                                    scan_running=false
+                                    echo ""  # New line after progress
+
+                                    if [ "$current_status" = "failed" ]; then
+                                        log_message "ERROR: ImunifyAV scan failed for $path"
+                                        echo "  ✗ Scan failed for $path"
+                                        continue 2
+                                    elif [ "$current_status" = "stopped" ]; then
+                                        log_message "WARNING: ImunifyAV scan was stopped for $path"
+                                        echo "  ⚠️  Scan was stopped (may be incomplete)"
+                                    fi
+                                    break
+                                fi
+
+                                # Update progress if file count changed
+                                if [[ "$current_files" =~ ^[0-9]+$ ]]; then
+                                    if [ "$current_files" != "$last_count" ]; then
+                                        elapsed=$(($(date +%s) - SCAN_START))
+                                        printf "\r  Files scanned: %s | Elapsed: %s | Status: %s  " \
+                                            "$current_files" "$(format_time $elapsed)" "$current_status"
+                                        last_count=$current_files
+                                        timeout_counter=0
+                                    fi
                                 fi
                             fi
                         fi
@@ -856,24 +886,14 @@ for scanner in "${AVAILABLE_SCANNERS[@]}"; do
                         sleep 3
                         timeout_counter=$((timeout_counter + 3))
                         if [ $timeout_counter -ge $max_timeout ]; then
-                            kill $SCAN_PID 2>/dev/null
                             log_message "ERROR: ImunifyAV scan timed out after 2 hours for $path"
                             echo -e "\n  ⏱️  Scan timed out (exceeded 2 hour limit)"
+                            # Try to stop the scan
+                            imunify-antivirus malware on-demand stop --path="$path" &>/dev/null
                             continue 2
                         fi
                     done
 
-                    # Wait for scan to complete
-                    wait $SCAN_PID
-                    SCAN_EXIT=$?
-                    echo ""  # New line after progress
-
-                    if [ $SCAN_EXIT -ne 0 ]; then
-                        log_message "ERROR: ImunifyAV scan failed for $path (exit code: $SCAN_EXIT)"
-                        echo "  ✗ Scan failed for $path (check logs)"
-                        continue
-                    fi
-
                     # Get final scan results
                     LAST_SCAN=$(imunify-antivirus malware on-demand list 2>/dev/null | tail -n +2 | head -1)
                     FILES_SCANNED=$(echo "$LAST_SCAN" | awk '{print $11}')