diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 7d53ce4044..27490c4048 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -104,7 +104,7 @@ func defaultNodeConfig() node.Config {
 	cfg.Name = clientIdentifier
 	cfg.Version = params.VersionWithCommit(gitCommit)
 	cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh")
-	cfg.WSModules = append(cfg.WSModules, "eth", "shh", "pss")
+	cfg.WSModules = append(cfg.WSModules, "eth", "shh")
 	cfg.IPCPath = "geth.ipc"
 	return cfg
 }
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 2b216a0036..296f4a609c 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -419,6 +419,12 @@ func bzzd(ctx *cli.Context) error {
 	}
 
 	cfg := defaultNodeConfig
+
+	//pss operates on ws
+	if bzzconfig.PssEnabled {
+		cfg.WSModules = append(cfg.WSModules, "pss")
+	}
+
 	//geth only supports --datadir via command line
 	//in order to be consistent within swarm, if we pass --datadir via environment variable
 	//or via config file, we get the same directory for geth and swarm