diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py
index e64b88da..e64308c7 100644
--- a/plexpy/activity_processor.py
+++ b/plexpy/activity_processor.py
@@ -39,7 +39,7 @@ class ActivityProcessor(object):
                       'parent_title': session['parent_title'],
                       'grandparent_title': session['grandparent_title'],
                       'friendly_name': session['friendly_name'],
-                      'ip_address': session['ip_address'],
+                      #'ip_address': session['ip_address'],
                       'player': session['player'],
                       'platform': session['platform'],
                       'parent_rating_key': session['parent_rating_key'],
@@ -67,6 +67,10 @@ class ActivityProcessor(object):
                       'transcode_height': session['transcode_height']
                       }
 
+            # Add ip_address back into values
+            if session['ip_address']:
+                values.update({'ip_address': session['ip_address']})
+
             keys = {'session_key': session['session_key'],
                     'rating_key': session['rating_key']}
 
@@ -88,12 +92,8 @@ class ActivityProcessor(object):
                     if plexpy.CONFIG.IP_LOGGING_ENABLE and plexpy.CONFIG.PMS_LOGS_FOLDER:
                         ip_address = self.find_session_ip(rating_key=session['rating_key'],
                                                           machine_id=session['machine_id'])
-                    else:
-                        ip_adress = None
-
-                    query = 'UPDATE sessions SET ip_address = ? WHERE session_key = ? AND rating_key = ? '
-                    args = [ip_address, session['session_key'], session['rating_key']]
-                    self.db.action(query=query, args=args)
+                        ip_address = {'ip_address': ip_address}
+                        self.db.upsert('sessions', ip_address, keys)
 
     def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0):
         from plexpy import users