diff --git a/client/app/components/QueryBasedParameterInput.jsx b/client/app/components/QueryBasedParameterInput.jsx
index 2479d51129..020cde3f06 100644
--- a/client/app/components/QueryBasedParameterInput.jsx
+++ b/client/app/components/QueryBasedParameterInput.jsx
@@ -77,7 +77,7 @@ export default class QueryBasedParameterInput extends React.Component {
   }
 
   render() {
-    const { className, value, mode, onSelect, ...otherProps } = this.props;
+    const { className, mode, onSelect, queryId, value, ...otherProps } = this.props;
     const { loading, options } = this.state;
     return (
       <span>
diff --git a/client/app/pages/queries/components/QuerySourceDropdown.jsx b/client/app/pages/queries/components/QuerySourceDropdown.jsx
index 2cdb54a016..aed1aa0220 100644
--- a/client/app/pages/queries/components/QuerySourceDropdown.jsx
+++ b/client/app/pages/queries/components/QuerySourceDropdown.jsx
@@ -29,7 +29,7 @@ export function QuerySourceDropdown(props) {
 
 QuerySourceDropdown.propTypes = {
   dataSources: PropTypes.any,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   disabled: PropTypes.bool,
   loading: PropTypes.bool,
   onChange: PropTypes.func,
diff --git a/client/app/pages/queries/components/QuerySourceDropdownItem.jsx b/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
index e15186dc9f..38e976f5f9 100644
--- a/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
+++ b/client/app/pages/queries/components/QuerySourceDropdownItem.jsx
@@ -15,7 +15,7 @@ export function QuerySourceDropdownItem({ dataSource, children }) {
 QuerySourceDropdownItem.propTypes = {
   dataSource: PropTypes.shape({
     name: PropTypes.string,
-    id: PropTypes.string,
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     type: PropTypes.string,
   }).isRequired,
   children: PropTypes.element,