diff --git a/src/aiida/brokers/rabbitmq/broker.py b/src/aiida/brokers/rabbitmq/broker.py
index 0ed8bcd0d..d268ecfaa 100644
--- a/src/aiida/brokers/rabbitmq/broker.py
+++ b/src/aiida/brokers/rabbitmq/broker.py
@@ -5,9 +5,8 @@
 import functools
 import typing as t
 
-from plumpy.rmq import RemoteProcessThreadController, RmqCoordinator
 from plumpy import ProcessController
-from plumpy.rmq.process_control import RemoteProcessController
+from plumpy.rmq import RemoteProcessThreadController, RmqCoordinator
 
 from aiida.brokers.broker import Broker
 from aiida.common.log import AIIDA_LOGGER
diff --git a/src/aiida/engine/runners.py b/src/aiida/engine/runners.py
index 92a62c071..f46fb85bf 100644
--- a/src/aiida/engine/runners.py
+++ b/src/aiida/engine/runners.py
@@ -24,10 +24,10 @@
 from plumpy.persistence import Persister
 from plumpy.rmq import RemoteProcessThreadController, wrap_communicator
 
+from aiida.brokers import Broker
 from aiida.common import exceptions
 from aiida.orm import ProcessNode, load_node
 from aiida.plugins.utils import PluginVersionProvider
-from aiida.brokers import Broker
 
 from . import transports, utils
 from .processes import Process, ProcessBuilder, ProcessState, futures