diff --git a/includes/scald.pages.inc b/includes/scald.pages.inc
index cbf05de..ded2220 100644
--- a/includes/scald.pages.inc
+++ b/includes/scald.pages.inc
@@ -356,16 +356,10 @@ function scald_atom_add_form_options_submit(&$form, &$form_state) {
 
     // Our form structure is different from standard Entity form because we
     // support multiple entities in a single form, so we have to process special
-    // stuffs here. Except when comes the Title module, which is a field.
-    $update_title = TRUE;
-    if (module_exists('title')) {
-      if (title_field_replacement_enabled('scald_atom', $atom->type, 'title')) {
-        // If Title field replaces the title property, it takes care of the sync
-        // in title_field_attach_submit() so we don't have to do anything.
-        $update_title = FALSE;
-      }
-    }
-    if ($update_title) {
+    // stuffs here.
+    // Except when comes the Title module, which is a field and it takes care of
+    // the sync in title_field_attach_submit() so we don't have to do anything.
+    if (!(module_exists('title') && title_field_replacement_enabled('scald_atom', $atom->type, 'title'))) {
       $atom->title = $form_state['values']['atom' . $delta]['title'];
     }