diff --git a/src/device/service/DeviceServiceServicerImpl.py b/src/device/service/DeviceServiceServicerImpl.py
index 483f6129f534ad49a1cfbc370666cdd2bc6c7055..5cabaea76972a799341541ce01ebc38628e834f5 100644
--- a/src/device/service/DeviceServiceServicerImpl.py
+++ b/src/device/service/DeviceServiceServicerImpl.py
@@ -91,12 +91,6 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
             device_with_uuids = context_client.GetDevice(device_id)
             populate_endpoint_monitoring_resources(device_with_uuids, self.monitoring_loops)
 
-            # TODO: remove next temporary workaround when issue with Automation component is resolved
-            device_with_uuids_2 = Device()
-            device_with_uuids_2.CopyFrom(device_with_uuids)
-            device_with_uuids_2.device_operational_status = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED
-            device_id = context_client.SetDevice(device_with_uuids_2)
-
             return device_id
         finally:
             self.mutex_queues.signal_done(device_uuid)