diff --git a/backend/internal/service/plugin_manager.go b/backend/internal/service/plugin_manager.go
index 53c0f94be3..f9f06e3bed 100644
--- a/backend/internal/service/plugin_manager.go
+++ b/backend/internal/service/plugin_manager.go
@@ -310,7 +310,9 @@ func (m *PluginManager) reconcileOnce(ctx context.Context) error {
 		healthErr := current.runtime.checkHealth(healthCtx)
 		cancel()
 		if healthErr != nil {
-			m.markRuntimeUnavailable(current, healthErr.Error())
+			if stateErr := m.markRuntimeUnavailable(current, healthErr.Error()); stateErr != nil {
+				return errors.Join(healthErr, stateErr)
+			}
 			return healthErr
 		}
 		if enabled.State == PluginStateError || (enabled.State == PluginStateStarting && m.startingStateExpired(enabled)) {