diff --git a/cmd/version.go b/cmd/version.go
deleted file mode 100644
index 7156ef02..00000000
--- a/cmd/version.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Package cmd implements various PocketBase system commands.
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/spf13/cobra"
-)
-
-// NewVersionCommand creates and returns new command that prints
-// the current PocketBase version.
-func NewVersionCommand(app core.App, version string) *cobra.Command {
-	return &cobra.Command{
-		Use:   "version",
-		Short: "Prints the current PocketBase app version",
-		Run: func(command *cobra.Command, args []string) {
-			fmt.Printf("PocketBase %s\n", version)
-		},
-	}
-}
diff --git a/pocketbase.go b/pocketbase.go
index 404e9fcf..dcb83542 100644
--- a/pocketbase.go
+++ b/pocketbase.go
@@ -73,11 +73,16 @@ func New() *PocketBase {
 
 	pb := &PocketBase{
 		RootCmd: &cobra.Command{
-			Use:   "pocketbase",
-			Short: "PocketBase CLI",
+			Use:     "pocketbase",
+			Short:   "PocketBase CLI",
+			Version: Version,
 			FParseErrWhitelist: cobra.FParseErrWhitelist{
 				UnknownFlags: true,
 			},
+			// no need to provide the default cobra completion command
+			CompletionOptions: cobra.CompletionOptions{
+				DisableDefaultCmd: true,
+			},
 		},
 		defaultDebug:         withGoRun,
 		defaultDataDir:       defaultDir,
@@ -85,9 +90,6 @@ func New() *PocketBase {
 		showStartBanner:      true,
 	}
 
-	// no need to provide the default cobra completion command
-	pb.RootCmd.CompletionOptions.DisableDefaultCmd = true
-
 	// parse base flags
 	// (errors are ignored, since the full flags parsing happens on Execute())
 	pb.eagerParseFlags()
@@ -130,7 +132,6 @@ func (pb *PocketBase) ShowStartBanner(val bool) *PocketBase {
 func (pb *PocketBase) Start() error {
 	// register system commands
 	pb.RootCmd.AddCommand(cmd.NewServeCommand(pb, pb.showStartBanner))
-	pb.RootCmd.AddCommand(cmd.NewVersionCommand(pb, Version))
 	pb.RootCmd.AddCommand(cmd.NewMigrateCommand(pb))
 
 	return pb.Execute()