diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index b99906edf..4897a2d97 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -565,7 +565,7 @@ UniValue decodescript(const JSONRPCRequest& request)
         r.pushKV("p2sh", EncodeDestination(CScriptID(script)));
         // P2SH and witness programs cannot be wrapped in P2WSH, if this script
         // is a witness program, don't return addresses for a segwit programs.
-        if (type.get_str().find("witness") == std::string::npos) {
+        if (type.get_str() == "pubkey" || type.get_str() == "pubkeyhash" || type.get_str() == "multisig" || type.get_str() == "nonstandard") {
             txnouttype which_type;
             std::vector<std::vector<unsigned char>> solutions_data;
             Solver(script, which_type, solutions_data);