diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index b8f4c4905..8563ba2d1 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -3367,9 +3367,10 @@ get_option(Options, Var, Def) ->
 -spec node_options(host(), binary()) -> [{atom(), any()}].
 node_options(Host, Type) ->
     DefaultOpts = node_plugin_options(Host, Type),
-    case config(Host, plugins) of
-	[Type|_] -> config(Host, default_node_config, DefaultOpts);
-	_ -> DefaultOpts
+    case lists:member(Type, config(Host, plugins)) of
+	true ->
+            config(Host, default_node_config, DefaultOpts);
+	false -> DefaultOpts
     end.
 
 -spec node_plugin_options(host(), binary()) -> [{atom(), any()}].