diff --git a/changelog/unreleased/pull-207 b/changelog/unreleased/pull-207
new file mode 100644
index 0000000..07629cc
--- /dev/null
+++ b/changelog/unreleased/pull-207
@@ -0,0 +1,5 @@
+Change: Return error if command-line arguments are specified
+
+The rest-server ignores command-line arguments. To prevent usage errors it not fails with an error instead of silently ignoring the arguments.
+
+https://github.com/restic/rest-server/pull/207
diff --git a/cmd/rest-server/main.go b/cmd/rest-server/main.go
index 8ed850b..e1baa39 100644
--- a/cmd/rest-server/main.go
+++ b/cmd/rest-server/main.go
@@ -23,7 +23,13 @@ var cmdRoot = &cobra.Command{
 	SilenceErrors: true,
 	SilenceUsage:  true,
 	RunE:          runRoot,
-	Version:       fmt.Sprintf("rest-server %s compiled with %v on %v/%v\n", version, runtime.Version(), runtime.GOOS, runtime.GOARCH),
+	Args: func(cmd *cobra.Command, args []string) error {
+		if len(args) != 0 {
+			return fmt.Errorf("rest-server expects no arguments - unknown argument: %s", args[0])
+		}
+		return nil
+	},
+	Version: fmt.Sprintf("rest-server %s compiled with %v on %v/%v\n", version, runtime.Version(), runtime.GOOS, runtime.GOARCH),
 }
 
 var server = restserver.Server{