diff --git a/logzio/handler.py b/logzio/handler.py
index 297df5b..f020453 100644
--- a/logzio/handler.py
+++ b/logzio/handler.py
@@ -88,13 +88,12 @@ class LogzioHandler(logging.Handler):
             return_json['exception'] = self.format_exception(message.exc_info)
         else:
             formatted_message = self.format(message)
-            return_json.update(self.extra_fields(message))
-
             if isinstance(formatted_message, dict):
                 return_json.update(formatted_message)
             else:
                 return_json['message'] = formatted_message
 
+        return_json.update(self.extra_fields(message))
         return return_json
 
     def emit(self, record):