diff --git a/cmd/loop/main.go b/cmd/loop/main.go
index 77d788824..7fa406f59 100644
--- a/cmd/loop/main.go
+++ b/cmd/loop/main.go
@@ -76,6 +76,15 @@ var (
 		Name:  "verbose, v",
 		Usage: "show expanded details",
 	}
+
+	commands = []cli.Command{
+		loopOutCommand, loopInCommand, termsCommand,
+		monitorCommand, quoteCommand, listAuthCommand, fetchL402Command,
+		listSwapsCommand, swapInfoCommand, getLiquidityParamsCommand,
+		setLiquidityRuleCommand, suggestSwapCommand, setParamsCommand,
+		getInfoCommand, abandonSwapCommand, reservationsCommands,
+		instantOutCommand, listInstantOutsCommand,
+	}
 )
 
 const (
@@ -142,15 +151,7 @@ func main() {
 		tlsCertFlag,
 		macaroonPathFlag,
 	}
-	app.Commands = []cli.Command{
-		loopOutCommand, loopInCommand, termsCommand,
-		monitorCommand, quoteCommand, listAuthCommand, fetchL402Command,
-		listSwapsCommand, swapInfoCommand, getLiquidityParamsCommand,
-		setLiquidityRuleCommand, suggestSwapCommand, setParamsCommand,
-		getInfoCommand, abandonSwapCommand, reservationsCommands,
-		instantOutCommand, listInstantOutsCommand,
-		staticAddressCommands,
-	}
+	app.Commands = commands
 
 	err := app.Run(os.Args)
 	if err != nil {
diff --git a/cmd/loop/staticaddr.go b/cmd/loop/staticaddr.go
index 41d1c0040..283a4b5e6 100644
--- a/cmd/loop/staticaddr.go
+++ b/cmd/loop/staticaddr.go
@@ -1,3 +1,6 @@
+//go:build staticaddr
+// +build staticaddr
+
 package main
 
 import (
@@ -18,6 +21,10 @@ import (
 	"github.com/urfave/cli"
 )
 
+func init() {
+	commands = append(commands, staticAddressCommands)
+}
+
 var staticAddressCommands = cli.Command{
 	Name:      "static",
 	ShortName: "s",