diff --git a/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx b/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
index bf8208f03e4..0b6f05fd45f 100644
--- a/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/tempo/traceql/TempoQueryBuilderOptions.tsx
@@ -26,7 +26,7 @@ export const TempoQueryBuilderOptions = React.memo<Props>(({ onChange, query })
               placeholder="auto"
               type="number"
               min={1}
-              defaultValue={DEFAULT_LIMIT}
+              defaultValue={query.limit || DEFAULT_LIMIT}
               onCommitChange={onLimitChange}
               value={query.limit}
             />