diff --git a/webform_select_limit.module b/webform_select_limit.module
index d65570c..147e8af 100644
--- a/webform_select_limit.module
+++ b/webform_select_limit.module
@@ -459,9 +459,16 @@ function webform_select_limit_generate_error_message($string, $component, $selec
  *   TRUE if the option is available FALSE if not.
  */
 function webform_select_limit_check_availability($cid, $nid, $option, $count) {
+  // Ignore draft submissions
+  $subcheck = db_select('webform_submissions', 's')
+	->fields('s', array('sid'))
+	->condition('nid', $nid)
+	->condition('is_draft',0)
+
   $check = db_select('webform_submitted_data', 'w')
     ->fields('w')
     ->condition('nid', $nid)
+    ->condition('sid', $subcheck, 'IN')
     ->condition('cid', $cid)
     ->condition('data', $option)
     ->execute();