diff --git a/server/eebus/helper.go b/server/eebus/helper.go
index d549f23b8..b84f71d06 100644
--- a/server/eebus/helper.go
+++ b/server/eebus/helper.go
@@ -12,7 +12,7 @@ import (
 )
 
 func WrapError(err error) error {
-	if errors.Is(err, eebusapi.ErrDataNotAvailable) {
+	if errors.Is(err, eebusapi.ErrDataNotAvailable) || errors.Is(err, eebusapi.ErrDataInvalid) {
 		return api.ErrNotAvailable
 	}
 	return err