diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index cb8ce997d..349c7ad4f 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -2352,7 +2352,10 @@ get_configure(Host, Node, From, Lang) ->
     transaction(Host, Node, Action, sync_dirty).
 
 get_default(Host, _Node, _From, Lang) ->
-    Type = hd(plugins(Host)),  % first configured plugin is default
+    Type = case Host of 
+    {_, _, _} -> ?PEPNODE;
+    _ -> hd(plugins(Host))
+    end,
     Options = node_options(Type),
     {result, [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB_OWNER}],
 		[{xmlelement, "default", [],