diff --git a/user_ip_address.module b/user_ip_address.module
index fa45835..030d3aa 100644
--- a/user_ip_address.module
+++ b/user_ip_address.module
@@ -102,7 +102,16 @@ function user_ip_address_field_formatter_view($entity_type, $entity, $field, $in
 function user_ip_address_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   if ($field['type'] == 'field_user_ip_address') {
     // If create entity we will get ip_address.
-    if (empty($entity->changed)) {
+    if ($entity_type == 'comment') {
+      if (empty($entity->cid)) {
+        $items = array(
+          array(
+            'user_ip_address' => ip_address(),
+          ),
+        );
+      }
+    }
+    elseif (empty($entity->changed)) {
       $items = array(
         array(
           'user_ip_address' => ip_address(),