diff --git a/txscript/standard.go b/txscript/standard.go
index ff382537..bae2b0c5 100644
--- a/txscript/standard.go
+++ b/txscript/standard.go
@@ -458,6 +458,8 @@ func typeOfScript(scriptVersion uint16, script []byte) ScriptClass {
 		return ScriptHashTy
 	case isMultisigScript(scriptVersion, script):
 		return MultiSigTy
+	case isNullDataScript(scriptVersion, script):
+		return NullDataTy
 	}
 
 	pops, err := parseScript(script)
@@ -469,9 +471,8 @@ func typeOfScript(scriptVersion uint16, script []byte) ScriptClass {
 		return WitnessV0PubKeyHashTy
 	} else if isWitnessScriptHash(pops) {
 		return WitnessV0ScriptHashTy
-	} else if isNullData(pops) {
-		return NullDataTy
 	}
+
 	return NonStandardTy
 }