diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index 392e35b9..8b2fffaf 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -568,12 +568,14 @@ def filter_datatable_session(list_of_dicts):
     import cherrypy
     from plexpy.webauth import SESSION_KEY
 
-    _cp_session = cherrypy.session.get(SESSION_KEY)
-    _session = {}
-    _session['username'], _session['user_id'], _session['user_group'], _session['expiry'] = \
-        _cp_session if _cp_session else (None, None, None, None)
+    if cherrypy.config.get('tools.auth.on'):
+        _session = {}
+        _cp_session = cherrypy.session.get(SESSION_KEY)
+        _session['username'], _session['user_id'], _session['user_group'], _session['expiry'] = \
+            _cp_session if _cp_session else (None, None, None, None)
 
-    if _session['user_id']:
-        return [d for d in list_of_dicts if str(d.get('user_id')) == str(_session['user_id'])]
-    else:
-        return list_of_dicts
\ No newline at end of file
+        if _session['user_id']:
+            session_user_id = str(_session['user_id'])
+            return [d for d in list_of_dicts if str(d.get('user_id')) == session_user_id]
+
+    return list_of_dicts
\ No newline at end of file
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index e081f89a..956e6884 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -49,10 +49,15 @@ def serve_template(templatename, **kwargs):
 
     server_name = plexpy.CONFIG.PMS_NAME
 
-    _cp_session = cherrypy.session.get(SESSION_KEY)
-    _session = {}
-    _session['username'], _session['user_id'], _session['user_group'], _session['expiry'] = \
-        _cp_session if _cp_session else (None, None, None, None)
+    _session = {'username': None,
+                'user_id': None,
+                'user_group': None,
+                'expiry': None}
+
+    if cherrypy.config.get('tools.auth.on'):
+        _cp_session = cherrypy.session.get(SESSION_KEY)
+        _session['username'], _session['user_id'], _session['user_group'], _session['expiry'] = \
+            _cp_session if _cp_session else (None, None, None, None)
 
     try:
         template = _hplookup.get_template(templatename)