diff --git a/pkg/plugins/manager/manager.go b/pkg/plugins/manager/manager.go
index 099a1d425a4..721234b9b36 100644
--- a/pkg/plugins/manager/manager.go
+++ b/pkg/plugins/manager/manager.go
@@ -228,7 +228,7 @@ func (m *PluginManager) Renderer() *plugins.Plugin {
 func (m *PluginManager) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	plugin := m.Plugin(req.PluginContext.PluginID)
 	if plugin == nil {
-		return &backend.QueryDataResponse{}, nil
+		return nil, backendplugin.ErrPluginNotRegistered
 	}
 
 	var resp *backend.QueryDataResponse