diff --git a/src/cmd/go/internal/list/list.go b/src/cmd/go/internal/list/list.go
index 31dcc206aa..66a51c5e4f 100644
--- a/src/cmd/go/internal/list/list.go
+++ b/src/cmd/go/internal/list/list.go
@@ -419,6 +419,12 @@ func (v *jsonFlag) needAny(fields ...string) bool {
 var nl = []byte{'\n'}
 
 func runList(ctx context.Context, cmd *base.Command, args []string) {
+	for _, arg := range args {
+		if arg == "" {
+			base.Fatalf("go: invalid package: %q", arg)
+		}
+	}
+
 	moduleLoader := modload.NewLoader()
 	moduleLoader.InitWorkfile()
 
diff --git a/src/cmd/go/testdata/script/list_empty_import.txt b/src/cmd/go/testdata/script/list_empty_import.txt
index 4d76f098b9..2a18107b67 100644
--- a/src/cmd/go/testdata/script/list_empty_import.txt
+++ b/src/cmd/go/testdata/script/list_empty_import.txt
@@ -3,6 +3,11 @@
 stderr 'invalid import path'
 ! stderr panic
 
+! go list ''
+stderr 'invalid package'
+! go list -m ''
+stderr 'invalid package'
+
 -- a.go --
 package a