diff --git a/CHANGELOG.md b/CHANGELOG.md
index adab5ce3e..452c2fea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v1.9.5
+
+#### Changed:
+
+* Add a useful error message when attempting moving a shared folder into a family
+  folder.
+
 ## v1.9.4:
 
 #### Changed:
diff --git a/src/maestral/errorhandling.py b/src/maestral/errorhandling.py
index 241a38bf7..d8d49d571 100644
--- a/src/maestral/errorhandling.py
+++ b/src/maestral/errorhandling.py
@@ -274,14 +274,13 @@ def dropbox_to_maestral_error(
                 else:
                     text = "You cannot move this folder into the Dropbox Vault."
                 err_cls = SyncError
-            # TODO: uncomment when updating to dropbox >= 11.27.0
-            # elif error.is_cant_move_into_family():
-            #     family_error = error.get_cant_move_into_family()
-            #     if family_error.is_is_shared_folder():
-            #         text = "You cannot move a shared folder into the Family folder."
-            #     else:
-            #         text = "You cannot move this folder into the Family folder."
-            #     err_cls = SyncError
+            elif error.is_cant_move_into_family():
+                family_error = error.get_cant_move_into_family()
+                if family_error.is_is_shared_folder():
+                    text = "You cannot move a shared folder into the Family folder."
+                else:
+                    text = "You cannot move this folder into the Family folder."
+                err_cls = SyncError
 
         elif isinstance(error, (files.CreateFolderError, files.CreateFolderEntryError)):
             title = "Could not create folder"