diff --git a/plexpy/api2.py b/plexpy/api2.py
index 82204223..34c5e4b1 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -689,8 +689,11 @@ General optional parameters:
         """ handles the stuff from the handler """
 
         # Make sure the device ID is not shown in the logs
-        if self._api_cmd == 'register_device' and kwargs.get('device_id'):
-            logger._BLACKLIST_WORDS.add(kwargs['device_id'])
+        if self._api_cmd == 'register_device':
+            if kwargs.get('device_id'):
+                logger._BLACKLIST_WORDS.add(kwargs['device_id'])
+            if kwargs.get('onesignal_id'):
+                logger._BLACKLIST_WORDS.add(kwargs['onesignal_id'])
 
         result = {}
         logger.api_debug('Tautulli APIv2 :: API called with kwargs: %s' % kwargs)