diff --git a/server/internal/command/appcmd/appcmd.go b/server/internal/command/appcmd/appcmd.go
index ced00d8b..4f7ce9a7 100644
--- a/server/internal/command/appcmd/appcmd.go
+++ b/server/internal/command/appcmd/appcmd.go
@@ -24,7 +24,7 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
 				logrus.Fatal(err)
 			}
 
-			if err := storage.Create(context.Background(), *db, viper.GetString("content-dir")); err != nil {
+			if err := storage.Create(context.Background(), *db, viper.GetString("default_storage_dir")); err != nil {
 				logrus.Fatal(err)
 			}
 			if err := core.Create(context.Background(), *db, storage.Default, debug); err != nil {
@@ -36,8 +36,8 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
 	flags.Bool("no-auto-migrate", false, "Do not automatically migrate database schema")
 	viper.BindPFlag("no_auto_migrate", flags.Lookup("no-auto-migrate"))
 
-	flags.StringP("content-dir", "C", "content", "Content Directory")
-	viper.BindPFlag("content_dir", flags.Lookup("content-dir"))
+	flags.StringP("default-storage-dir", "S", "storage/default", "Default Storage Directory")
+	viper.BindPFlag("default_storage_dir", flags.Lookup("default-storage-dir"))
 
 	cmd.AddCommand([]*cobra.Command{
 		setupServeCommand(),
diff --git a/server/internal/storage/storage.go b/server/internal/storage/storage.go
index afb430ec..4ef4ccf9 100644
--- a/server/internal/storage/storage.go
+++ b/server/internal/storage/storage.go
@@ -28,14 +28,16 @@ type storage struct {
 
 var Default Storage
 
-func Create(ctx context.Context, db *db.DbHandler, contentDir string) error {
+func Create(ctx context.Context, db *db.DbHandler, defaultStorageDir string) error {
 	if backends, err := restoreBackends(db, ctx); err != nil {
 		return err
+	} else if defaultBackend, err := newLocalStorage("<default>", defaultStorageDir); err != nil {
+		return err
 	} else {
 		Default = storage{
 			db:             db,
 			backends:       backends,
-			defaultBackend: localStorage{name: "<default>", root: contentDir},
+			defaultBackend: defaultBackend,
 		}
 		return nil
 	}