diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 239cd5b..fb82b10 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1551,7 +1551,9 @@ function comment_save($comment) {
 
       // Add the values which aren't passed into the function.
       $comment->thread = $thread;
-      $comment->hostname = ip_address();
+      if (empty($comment->hostname)){
+        $comment->hostname = ip_address();
+      }
 
       drupal_write_record('comment', $comment);