diff --git a/README.md b/README.md
index cb989b4..adf80f7 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ Heath check.
 | `port`    | `WHOAMI_PORT_NUMBER` | Give me a port number. (default: `80`)  |
 | `name`    | `WHOAMI_NAME`        | Give me a name.                         |
 | `verbose` |                      | Enable verbose logging.                 |
+| `no-data` |                      | Disable data handler.                   |
 
 ## Examples
 
diff --git a/app.go b/app.go
index 36665c3..c173532 100644
--- a/app.go
+++ b/app.go
@@ -38,10 +38,12 @@ var (
 	port    string
 	name    string
 	verbose bool
+	no_data bool
 )
 
 func init() {
 	flag.BoolVar(&verbose, "verbose", false, "Enable verbose logging")
+	flag.BoolVar(&no_data, "no-data", false, "Disable data handler")
 	flag.StringVar(&cert, "cert", "", "give me a certificate")
 	flag.StringVar(&key, "key", "", "give me a key")
 	flag.StringVar(&ca, "cacert", "", "give me a CA chain, enforces mutual TLS")
@@ -153,6 +155,11 @@ func printBinary(s []byte) {
 }
 
 func dataHandler(w http.ResponseWriter, r *http.Request) {
+	if no_data {
+		_, _ = fmt.Fprintln(w, "dataHandler disabled!")
+		return
+	}
+
 	u, _ := url.Parse(r.URL.String())
 	queryParams := u.Query()