diff --git a/docs/release-notes/release-notes-0.15.1.md b/docs/release-notes/release-notes-0.15.1.md
index 3f431a2a83..30b1126c3f 100644
--- a/docs/release-notes/release-notes-0.15.1.md
+++ b/docs/release-notes/release-notes-0.15.1.md
@@ -164,6 +164,9 @@ default](https://github.com/lightningnetwork/lnd/pull/6810) in most cases.
 * [Remove `ScidAliasOptional` dependency on 
 `ExplicitChannelTypeOptional`](https://github.com/lightningnetwork/lnd/pull/6809)
 
+* [Add a default case](https://github.com/lightningnetwork/lnd/pull/6847) to the
+  Address Type switch statement in the `NewAddress` rpc server method.
+
 ## Code Health
 
 ### Code cleanup, refactor, typo fixes
diff --git a/rpcserver.go b/rpcserver.go
index 95d0b136d5..a2befc0e44 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1542,6 +1542,9 @@ func (r *rpcServer) NewAddress(ctx context.Context,
 		if err != nil {
 			return nil, err
 		}
+
+	default:
+		return nil, fmt.Errorf("unknown address type: %v", in.Type)
 	}
 
 	rpcsLog.Debugf("[newaddress] account=%v type=%v addr=%v", account,