diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
index 3db1ddac..d81b9b20 100644
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -317,6 +317,14 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		}
 	}
 
+	if allSettings.Firewall.Enabled {
+		const enable = false
+		err := firewallConf.SetEnabled(context.Background(), enable)
+		if err != nil {
+			logger.Error(err)
+		}
+	}
+
 	wg.Wait()
 
 	return nil
diff --git a/internal/firewall/enable.go b/internal/firewall/enable.go
index c51ba063..257cc24d 100644
--- a/internal/firewall/enable.go
+++ b/internal/firewall/enable.go
@@ -30,7 +30,7 @@ func (c *configurator) SetEnabled(ctx context.Context, enabled bool) (err error)
 	if !enabled {
 		c.logger.Info("disabling...")
 		if err = c.disable(ctx); err != nil {
-			return fmt.Errorf("%w: %s", ErrDisable, err)
+			return err
 		}
 		c.enabled = false
 		c.logger.Info("disabled successfully")