diff --git a/plexpy/api2.py b/plexpy/api2.py
index 4ee867d5..cb205ee5 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -715,12 +715,16 @@ 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':
+        if kwargs.get('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'])
 
+        elif kwargs.get('cmd') == 'get_apikey':
+            if kwargs.get('password'):
+                logger._BLACKLIST_WORDS.add(kwargs['password'])
+
         result = {}
         logger.api_debug('Tautulli APIv2 :: API called with kwargs: %s' % kwargs)