diff --git a/joycontrol/server.py b/joycontrol/server.py
index e4d9faef..9642183e 100644
--- a/joycontrol/server.py
+++ b/joycontrol/server.py
@@ -75,9 +75,8 @@ async def create_hid_server(protocol_factory, ctl_psm=17, itr_psm=19, device_id=
         itr_sock.listen(1)
 
         hid.powered(True)
-        # setting bluetooth adapter name and class to the device we wish to emulate
+        # setting bluetooth adapter name to the device we wish to emulate
         await hid.set_name(protocol.controller.device_name())
-        await hid.set_class()
 
         logger.info('Advertising the Bluetooth SDP record...')
         try:
@@ -86,6 +85,8 @@ async def create_hid_server(protocol_factory, ctl_psm=17, itr_psm=19, device_id=
             # Already registered (If multiple controllers are being emulated and this method is called consecutive times)
             logger.debug(dbus_err)
 
+        await hid.set_class()
+
         # start advertising
         hid.discoverable()