diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py
index f866f3b171..9f2b1807d0 100644
--- a/trove/cmd/guest.py
+++ b/trove/cmd/guest.py
@@ -59,6 +59,7 @@ def main():
     from trove.common.rpc import service as rpc_service
     from trove.common.rpc import version as rpc_version
     server = rpc_service.RpcService(
+        topic="guestagent.%s" % CONF.guest_id,
         manager=manager, host=CONF.guest_id,
         rpc_api_version=rpc_version.RPC_API_VERSION)