diff --git a/plexpy/api2.py b/plexpy/api2.py
index 1e219389..eefc506e 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -440,7 +440,7 @@ class API2(object):
             self._api_msg = 'Device registration successful.'
             self._api_result_type = 'success'
 
-            mobile_app.set_temp_device_token(None)
+            mobile_app.set_temp_device_token(True)
 
             data = {
                 "pms_name": plexpy.CONFIG.PMS_NAME,
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 5fa7aae3..1661211f 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3779,8 +3779,8 @@ class WebInterface(object):
             mobile_app.set_temp_device_token(None)
             return {'result': 'error', 'message': 'Device registration cancelled.'}
 
-        result = mobile_app.get_mobile_device_by_token(device_token)
-        if result:
+        result = mobile_app.get_temp_device_token()
+        if result is True:
             mobile_app.set_temp_device_token(None)
             return {'result': 'success', 'message': 'Device registered successfully.', 'data': result}
         else: