diff --git a/modules/instrument_builder/jsx/react.questions.js b/modules/instrument_builder/jsx/react.questions.js
index c4fb7309424..9f2890198ce 100644
--- a/modules/instrument_builder/jsx/react.questions.js
+++ b/modules/instrument_builder/jsx/react.questions.js
@@ -526,8 +526,8 @@ class ListElements extends Component {
         break;
       case 'numeric':
         newState.Options = {
-          MinValue: 0,
-          MaxValue: 0,
+          MinValue: null,
+          MaxValue: null,
         };
         break;
       default:
@@ -703,7 +703,7 @@ class AddElement extends Component {
       let min = this.state.Options.MinValue;
       let max = this.state.Options.MaxValue;
 
-      if (min >= max) {
+      if (min && max && min >= max) {
         let temp = (this.state.error) ? this.state.error : {};
         temp.numeric = 'Max value must be larger than min value';
         this.setState({