diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 60d33cb6..76441f73 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -2710,6 +2710,13 @@ div[id^='media_info_child'] div[id^='media_info_child'] div.dataTables_scrollHea
 .dataTables_scrollBody {
     -webkit-overflow-scrolling: touch;
 }
+.current-activity-row {
+    background-color: rgba(255,255,255,.1) !important;
+}
+.current-activity-row:hover {
+    background-color: rgba(255,255,255,0.125) !important;
+}
+
 #search_form {
     width: 300px;
     padding: 8px 15px;
@@ -3015,4 +3022,4 @@ a:hover .overlay-refresh-image:hover {
     text-align: center;
     padding-top: 10px;
     padding-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 7d8c819e..384e03b2 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -319,6 +319,9 @@ history_table_options = {
             history_table.row(row).child(childTableFormat(rowData)).show();
         }
 
+        if (rowData['state'] !== null) {
+            $(row).addClass('current-activity-row');
+        }
     }
 }
 
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 2ef3a881..7af79be4 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -123,6 +123,12 @@
                             </label>
                             <p class="help-block">Group successive play history by the same user as a single entry in the tables and watch statistics.</p>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="history_table_activity" name="history_table_activity" value="1" ${config['history_table_activity']}> Current Activity in History Tables
+                            </label>
+                            <p class="help-block">Include current activity in the history tables. Statistics will not be counted until the stream has ended.</p>
+                        </div>
 
                         <div class="padded-header">
                             <h3>Backup</h3>
diff --git a/plexpy/config.py b/plexpy/config.py
index fbde4e28..f228056c 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -192,6 +192,7 @@ _CONFIG_DEFINITIONS = {
     'GROWL_ON_PMSUPDATE': (int, 'Growl', 0),
     'GROWL_ON_CONCURRENT': (int, 'Growl', 0),
     'GROWL_ON_NEWDEVICE': (int, 'Growl', 0),
+    'HISTORY_TABLE_ACTIVITY': (int, 'General', 1),
     'HOME_SECTIONS': (list, 'General', ['current_activity','watch_stats','library_stats','recently_added']),
     'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']),
     'HOME_STATS_LENGTH': (int, 'General', 30),
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c2d008bd..78cd9e7d 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2505,6 +2505,7 @@ class WebInterface(object):
 
         config = {
             "allow_guest_access": checked(plexpy.CONFIG.ALLOW_GUEST_ACCESS),
+            "history_table_activity": checked(plexpy.CONFIG.HISTORY_TABLE_ACTIVITY),
             "http_basic_auth": checked(plexpy.CONFIG.HTTP_BASIC_AUTH),
             "http_hash_password": checked(plexpy.CONFIG.HTTP_HASH_PASSWORD),
             "http_hashed_password": plexpy.CONFIG.HTTP_HASHED_PASSWORD,
@@ -2634,7 +2635,8 @@ class WebInterface(object):
             "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",
             "notify_consecutive", "notify_upload_posters", "notify_recently_added", "notify_recently_added_grandparent",
             "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
-            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip"
+            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
+            "history_table_activity"
         ]
         for checked_config in checked_configs:
             if checked_config not in kwargs: