diff --git a/pkg/services/apiserver/endpoints/request/namespace.go b/pkg/services/apiserver/endpoints/request/namespace.go
index ccec8680f81..34f8a00bceb 100644
--- a/pkg/services/apiserver/endpoints/request/namespace.go
+++ b/pkg/services/apiserver/endpoints/request/namespace.go
@@ -68,7 +68,7 @@ func ParseNamespace(ns string) (NamespaceInfo, error) {
 
 	if strings.HasPrefix(ns, "stack-") {
 		info.StackID = ns[6:]
-		if len(info.StackID) < 2 {
+		if len(info.StackID) < 1 {
 			return info, fmt.Errorf("invalid stack id")
 		}
 		info.OrgID = 1
diff --git a/pkg/services/apiserver/endpoints/request/namespace_test.go b/pkg/services/apiserver/endpoints/request/namespace_test.go
index cd5a8e58394..86c863e3ef6 100644
--- a/pkg/services/apiserver/endpoints/request/namespace_test.go
+++ b/pkg/services/apiserver/endpoints/request/namespace_test.go
@@ -94,11 +94,11 @@ func TestParseNamespace(t *testing.T) {
 		},
 		{
 			name:      "invalid stack id (too short)",
-			namespace: "stack-1",
+			namespace: "stack-",
 			expectErr: true,
 			expected: request.NamespaceInfo{
 				OrgID:   -1,
-				StackID: "1",
+				StackID: "",
 			},
 		},
 		{