diff --git a/htlcswitch/hodl/config.go b/htlcswitch/hodl/config_debug.go
similarity index 99%
rename from htlcswitch/hodl/config.go
rename to htlcswitch/hodl/config_debug.go
index 22a65b52..957eb50d 100644
--- a/htlcswitch/hodl/config.go
+++ b/htlcswitch/hodl/config_debug.go
@@ -1,3 +1,5 @@
+// +build debug
+
 package hodl
 
 // Config is a struct enumerating the possible command line flags that are used
diff --git a/htlcswitch/hodl/config_production.go b/htlcswitch/hodl/config_production.go
new file mode 100644
index 00000000..8daeefd8
--- /dev/null
+++ b/htlcswitch/hodl/config_production.go
@@ -0,0 +1,11 @@
+// +build !debug
+
+package hodl
+
+// Config is an empty struct disabling command line hodl flags in production.
+type Config struct{}
+
+// Mask in production always returns MaskNone.
+func (c *Config) Mask() Mask {
+	return MaskNone
+}