diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go
index 689cbed544..2773eb2835 100644
--- a/ocs/pkg/server/http/svc_test.go
+++ b/ocs/pkg/server/http/svc_test.go
@@ -1576,7 +1576,6 @@ func TestAddUsersToGroupsNewUsers(t *testing.T) {
 	}
 }
 
-// Issue: https://github.com/owncloud/ocis/ocs/issues/55 Incorrect message when adding user to non existing group
 func TestAddUsersToGroupInvalidGroup(t *testing.T) {
 	user := User{
 		Enabled:     "true",
@@ -1629,7 +1628,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) {
 				assertResponseMeta(t, Meta{
 					"error",
 					998,
-					"The requested user could not be found",
+					"The requested group could not be found",
 				}, response.Ocs.Meta)
 				assert.Empty(t, response.Ocs.Data)
 			}
diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go
index 47959ec083..3f799bcb90 100644
--- a/ocs/pkg/service/v0/groups.go
+++ b/ocs/pkg/service/v0/groups.go
@@ -64,7 +64,12 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) {
 	})
 
 	if err != nil {
-		render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
+		merr := merrors.FromError(err)
+		if merr.Code == http.StatusNotFound {
+			render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found"))
+		} else {
+			render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
+		}
 		o.logger.Error().Err(err).Str("userid", userid).Str("groupid", groupid).Msg("could not add user to group")
 		return
 	}
@@ -95,7 +100,12 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) {
 	})
 
 	if err != nil {
-		render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
+		merr := merrors.FromError(err)
+		if merr.Code == http.StatusNotFound {
+			render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found"))
+		} else {
+			render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
+		}
 		o.logger.Error().Err(err).Str("userid", userid).Str("groupid", groupid).Msg("could not remove user from group")
 		return
 	}