diff --git a/webform.api.php b/webform.api.php
index 131f4ed..70968e6 100644
--- a/webform.api.php
+++ b/webform.api.php
@@ -906,8 +906,7 @@ function _webform_render_component($component, $value = NULL, $filter = TRUE, $s
     '#weight' => $component['weight'],
     '#description'   => $filter ? webform_filter_descriptions($component['extra']['description']) : $component['extra']['description'],
     '#default_value' => $filter ? webform_replace_tokens($component['value']) : $component['value'],
-    '#prefix' => '<div class="webform-component-textfield" id="webform-component-' . $component['form_key'] . '">',
-    '#suffix' => '</div>',
+    '#theme_wrappers' => array('webform_element'),
   );
 
   if (isset($value)) {