diff --git a/teamserver/cmd/cmd.go b/teamserver/cmd/cmd.go
index 7f8319a7..d892ca2e 100644
--- a/teamserver/cmd/cmd.go
+++ b/teamserver/cmd/cmd.go
@@ -32,6 +32,7 @@ func init() {
 	// server flags
 	CobraServer.Flags().SortFlags = false
 	CobraServer.Flags().StringVarP(&flags.Server.Profile, "profile", "", "", "set havoc teamserver profile")
+	CobraServer.Flags().StringVarP(&flags.Server.Database, "database", "", "data/teamserver.db", "set havoc teamserver database")
 	CobraServer.Flags().BoolVarP(&flags.Server.Debug, "debug", "", false, "enable debug mode")
 	CobraServer.Flags().BoolVarP(&flags.Server.DebugDev, "debug-dev", "", false, "enable debug mode for developers (compiles the agent with the debug mode/macro enabled)")
 	CobraServer.Flags().BoolVarP(&flags.Server.SendLogs, "send-logs", "", false, "the agent will send logs over http(s) to the teamserver")
diff --git a/teamserver/cmd/server.go b/teamserver/cmd/server.go
index 0fcefab2..f7c16f03 100644
--- a/teamserver/cmd/server.go
+++ b/teamserver/cmd/server.go
@@ -33,7 +33,10 @@ var CobraServer = &cobra.Command{
 			}
 			os.Exit(0)
 		}
-
+		
+		if flags.Server.Database != "" {
+			DatabasePath = (flags.Server.Database)
+		}
 		Server = server.NewTeamserver(DatabasePath)
 		Server.SetServerFlags(flags)
 
diff --git a/teamserver/cmd/server/types.go b/teamserver/cmd/server/types.go
index 7fd2b556..02372781 100644
--- a/teamserver/cmd/server/types.go
+++ b/teamserver/cmd/server/types.go
@@ -42,6 +42,7 @@ type serverFlags struct {
 	Host string
 	Port string
 
+	Database string
 	Profile  string
 	Verbose  bool
 	Debug    bool