diff --git a/src/Groups/gsets.jl b/src/Groups/gsets.jl
index e6c4437ae3a3..59236e42c58c 100644
--- a/src/Groups/gsets.jl
+++ b/src/Groups/gsets.jl
@@ -1271,6 +1271,7 @@ function orbit_representatives_and_stabilizers(G::MatrixGroup{E}, k::Int) where
   n = degree(G)
   q = GAP.Obj(order(F))
   V = vector_space(F, n)
+  k == 0 && return [(sub(V, [])[1], G)]
   # Note that GAP anyhow unpacks all subspaces.
   l = GAP.Globals.AsSSortedList(GAP.Globals.Subspaces(GAPWrap.GF(q)^n, k))::GapObj
   ll = GAP.Globals.List(l,
diff --git a/test/Groups/gsets.jl b/test/Groups/gsets.jl
index 5fc31b2f3867..621e90c0a99a 100644
--- a/test/Groups/gsets.jl
+++ b/test/Groups/gsets.jl
@@ -335,8 +335,7 @@ end
     GL = general_linear_group(n, F)
     S = sylow_subgroup(GL, 2)[1]
     for G in [GL, S]
-#     for k in 0:n   # k = 0 is a problem in GAP 4.12.0
-      for k in 1:n
+      for k in 0:n
         res = orbit_representatives_and_stabilizers(G, k)
         total = ZZ(0)
         for (U, stab) in res