diff --git a/frontend/src/metabase/selectors/metadata.js b/frontend/src/metabase/selectors/metadata.js
index 37e808da0fbbc3d161eaf23bcb8621c5e963414b..92be9f712a25cd91fcafc3d2defa791535311f31 100644
--- a/frontend/src/metabase/selectors/metadata.js
+++ b/frontend/src/metabase/selectors/metadata.js
@@ -134,7 +134,8 @@ const getParameterFieldValuesByFieldId = (state, props) => {
     // NOTE Atte Keinänen 9/14/17: Reading the state directly instead of using `getFields` selector
     // because `getMetadata` doesn't currently work with fields of public dashboards
     return _.chain(getIn(state, ["metadata", "fields"]))
-        .pick(getFields(state), ...props.parameter.field_ids)
+        // SQL template tags provide `field_id` instead of `field_ids`
+        .pick(...(props.parameter.field_ids || [props.parameter.field_id]))
         .mapObject(getFieldValues)
         .value()
 }