diff --git a/packages/grafana-sql/src/SQLVariableSupport.tsx b/packages/grafana-sql/src/SQLVariableSupport.tsx
index c88b910067c..d5e8d23be51 100644
--- a/packages/grafana-sql/src/SQLVariableSupport.tsx
+++ b/packages/grafana-sql/src/SQLVariableSupport.tsx
@@ -150,8 +150,6 @@ const convertOriginalFieldsToVariableFields = (original_fields: Field[], meta?:
   }
   const textField = tf || vf || original_fields[0];
   const valueField = vf || tf || original_fields[0];
-  return [
-    { ...textField, name: 'text' },
-    { ...valueField, name: 'value' },
-  ];
+  const otherFields = original_fields.filter((f: Field) => f.name !== 'value' && f.name !== 'text');
+  return [{ ...textField, name: 'text' }, { ...valueField, name: 'value' }, ...otherFields];
 };