diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 717796fec..57e795290 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -3432,7 +3432,7 @@ serverhost(Host) ->
 
 -spec tree(host()) -> atom().
 tree(Host) ->
-    case config(Host, nodetree) of
+    case config(serverhost(Host), nodetree) of
 	undefined -> tree(Host, ?STDTREE);
 	Tree -> Tree
     end.