diff --git a/js/webform.states.js b/js/webform.states.js
index 2b014ce2..9c7f0bd1 100644
--- a/js/webform.states.js
+++ b/js/webform.states.js
@@ -55,10 +55,10 @@
       return !((new RegExp(reference['!pattern'])).test(value));
     }
     else if ('less' in reference) {
-      return (value !== '' && reference.less > value);
+      return (value !== '' && parseFloat(reference.less) > parseFloat(value));
     }
     else if ('greater' in reference) {
-      return (value !== '' && reference.greater < value);
+      return (value !== '' && parseFloat(reference.greater) < parseFloat(value));
     }
     else {
       return reference.indexOf(value) !== false;
diff --git a/src/WebformSubmissionConditionsValidator.php b/src/WebformSubmissionConditionsValidator.php
index 71a2bb70..f1619200 100644
--- a/src/WebformSubmissionConditionsValidator.php
+++ b/src/WebformSubmissionConditionsValidator.php
@@ -461,11 +461,11 @@ class WebformSubmissionConditionsValidator implements WebformSubmissionCondition
         break;
 
       case 'less':
-        $result = ($element_value !== '' && $trigger_value > $element_value);
+        $result = ($element_value !== '' && floatval($trigger_value) > floatval($element_value));
         break;
 
       case 'greater':
-        $result = ($element_value !== '' && $trigger_value < $element_value);
+        $result = ($element_value !== '' && floatval($trigger_value) < floatval($element_value));
         break;
 
       default: