diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index f14c53b..88ac138 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -1174,6 +1174,10 @@ NTSTATUS _samr_EnumDomainGroups(pipes_struct *p,

        DEBUG(5,("_samr_EnumDomainGroups: %d\n", __LINE__));

+       if (num_groups >= MAX_SAM_ENTRIES) {
+               status = STATUS_MORE_ENTRIES;
+       }
+
        return status;
 }

@@ -1240,6 +1244,10 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
        *r->out.num_entries = num_aliases;
        *r->out.resume_handle = num_aliases + *r->in.resume_handle;

+       if (num_aliases >= MAX_SAM_ENTRIES) {
+               status = STATUS_MORE_ENTRIES;
+       }
+
        return status;
 }