diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py
index 36e6754..7a16cc7 100644
--- a/tests/annotations/tests.py
+++ b/tests/annotations/tests.py
@@ -261,6 +261,16 @@ class NonAggregateAnnotationTestCase(TestCase):
         book_postupdate = Book.objects.get(pk=self.b2.pk)
         self.assertEqual(book_preupdate.rating - 1, book_postupdate.rating)
 
+    def test_joined_f_update_errors_are_clear_when_annotating(self):
+        error_msg = 'Joined field references are not permitted in this query'
+        with self.assertRaisesMessage(FieldError, error_msg):
+            Book.objects.update(name=F('contact__name'))
+
+        with self.assertRaisesMessage(FieldError, error_msg):
+            Book.objects.annotate(
+                contact_name=F('contact__name')
+            ).update(name=F('contact_name'))
+
     def test_annotation_with_m2m(self):
         books = Book.objects.annotate(author_age=F('authors__age')).filter(pk=self.b1.pk).order_by('author_age')
         self.assertEqual(books[0].author_age, 34)