diff --git a/swarm/pss/api.go b/swarm/pss/api.go
index 50e11dc29d..959f9037ab 100644
--- a/swarm/pss/api.go
+++ b/swarm/pss/api.go
@@ -188,8 +188,5 @@ func (pssapi *API) GetPeerAddress(pubkeyhex string, topic Topic) (PssAddress, er
 }
 
 func checkMsg(msg []byte) bool {
-	if msg == nil || len(msg) == 0 {
-		return false
-	}
-	return true
+	return len(msg) > 0
 }
diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go
index e85f2299b6..dc9c08e7ed 100644
--- a/swarm/pss/pss.go
+++ b/swarm/pss/pss.go
@@ -1041,8 +1041,5 @@ func (p *Pss) digestBytes(msg []byte) pssDigest {
 }
 
 func checkAddress(addr PssAddress) bool {
-	if len(addr) > addressLength {
-		return false
-	}
-	return true
+	return len(addr) <= addressLength
 }