diff --git a/cmd/woj/woj.go b/cmd/woj/woj.go
index 76975f0..c4d7100 100644
--- a/cmd/woj/woj.go
+++ b/cmd/woj/woj.go
@@ -94,10 +94,13 @@ func prepareServices(c *cli.Context) *do.Injector {
 func wrap(f func(i *do.Injector) error) func(*cli.Context) error {
 	return func(c *cli.Context) error {
 		defer func() {
-			if r := recover(); r != nil {
-				sentry.CaptureException(r.(error))
-				sentry.Flush(time.Second * 2)
-				slog.Printf("Panic Captured: %v", r)
+			if cmd.SentryDSN != "" {
+				// only recover when sentry is enabled
+				if r := recover(); r != nil {
+					sentry.CaptureException(r.(error))
+					sentry.Flush(time.Second * 2)
+					slog.Printf("Panic Captured: %v", r)
+				}
 			}
 		}()
 
diff --git a/internal/misc/log/zap.go b/internal/misc/log/zap.go
index 5b8a687..a9fd97a 100644
--- a/internal/misc/log/zap.go
+++ b/internal/misc/log/zap.go
@@ -1,6 +1,7 @@
 package log
 
 import (
+	"git.0x7f.app/WOJ/woj-server/cmd"
 	"git.0x7f.app/WOJ/woj-server/internal/misc/config"
 	"git.0x7f.app/WOJ/woj-server/pkg/utils"
 	"github.com/TheZeroSlave/zapsentry"
@@ -48,7 +49,9 @@ func NewService(i *do.Injector) (Service, error) {
 		return nil, err
 	}
 
-	srv.logger = attachSentry(srv.logger)
+	if cmd.SentryDSN != "" {
+		srv.logger = attachSentry(srv.logger)
+	}
 
 	return srv, nil
 }