diff --git a/ansible/files/prosody.cfg.lua b/ansible/files/prosody.cfg.lua
index 149a1b6..3cad7a0 100644
--- a/ansible/files/prosody.cfg.lua
+++ b/ansible/files/prosody.cfg.lua
@@ -95,6 +95,7 @@ modules_enabled = {
 		"invites_register";
 		"invites_register_api";
 		"invites_tracking";
+		"invites_default_group";
 
 		"invites_api";
 		"watchregistrations";
diff --git a/ansible/tasks/prosody.yml b/ansible/tasks/prosody.yml
index f9af4c4..85c8c96 100644
--- a/ansible/tasks/prosody.yml
+++ b/ansible/tasks/prosody.yml
@@ -118,6 +118,7 @@
   loop:
     - mod_update_check
     - mod_update_notify
+    - mod_invites_default_group
 
 - name: "Install lua-ossl for encrypted push notifications"
   apt:
diff --git a/snikket-modules/mod_invites_default_group.lua b/snikket-modules/mod_invites_default_group.lua
new file mode 100644
index 0000000..2db2b32
--- /dev/null
+++ b/snikket-modules/mod_invites_default_group.lua
@@ -0,0 +1,11 @@
+-- This module adds groupless invites created via the app to
+-- the default group
+module:hook("invite-created", function (invite)
+	if invite.type == "roster"
+	and not (invite.additional_data and invite.additional_data.groups) then
+		if not invite.addititional_data then
+			invite.additional_data = {};
+		end
+		invite.additional_data.groups = { "default" };
+	end
+end);