diff --git a/crates/openshell-core/src/config.rs b/crates/openshell-core/src/config.rs
index 750aa98b..2f104088 100644
--- a/crates/openshell-core/src/config.rs
+++ b/crates/openshell-core/src/config.rs
@@ -250,7 +250,7 @@ impl Config {
 }
 
 fn default_bind_address() -> SocketAddr {
-    "0.0.0.0:8080".parse().expect("valid default address")
+    "127.0.0.1:8080".parse().expect("valid default address")
 }
 
 fn default_log_level() -> String {
diff --git a/crates/openshell-server/src/main.rs b/crates/openshell-server/src/main.rs
index 5178693a..0598e717 100644
--- a/crates/openshell-server/src/main.rs
+++ b/crates/openshell-server/src/main.rs
@@ -5,7 +5,6 @@
 
 use clap::Parser;
 use miette::{IntoDiagnostic, Result};
-use std::net::SocketAddr;
 use std::path::PathBuf;
 use tracing::info;
 use tracing_subscriber::EnvFilter;
@@ -18,9 +17,9 @@ use openshell_server::{run_server, tracing_bus::TracingLogBus};
 #[command(version = openshell_core::VERSION)]
 #[command(about = "OpenShell gRPC/HTTP server", long_about = None)]
 struct Args {
-    /// Port to bind the server to (all interfaces).
-    #[arg(long, default_value_t = 8080, env = "OPENSHELL_SERVER_PORT")]
-    port: u16,
+    /// Address to bind the server to. Defaults to loopback for safety.
+    #[arg(long, env = "OPENSHELL_SERVER_BIND", default_value = "127.0.0.1:8080")]
+    bind: std::net::SocketAddr,
 
     /// Log level (trace, debug, info, warn, error).
     #[arg(long, default_value = "info", env = "OPENSHELL_LOG_LEVEL")]
@@ -125,7 +124,6 @@ async fn main() -> Result<()> {
     );
 
     // Build configuration
-    let bind = SocketAddr::from(([0, 0, 0, 0], args.port));
 
     let tls = if args.disable_tls {
         None
@@ -152,7 +150,7 @@ async fn main() -> Result<()> {
     };
 
     let mut config = openshell_core::Config::new(tls)
-        .with_bind_address(bind)
+        .with_bind_address(args.bind)
         .with_log_level(&args.log_level);
 
     config = config