diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
index cf6a8ad0476..6ab927bd560 100644
--- a/django/contrib/gis/db/models/sql/compiler.py
+++ b/django/contrib/gis/db/models/sql/compiler.py
@@ -119,14 +119,16 @@ class GeoSQLCompiler(compiler.SQLCompiler):
         result = []
         if opts is None:
             opts = self.query.model._meta
-        # Skip all proxy to the root proxied model
-        opts = opts.concrete_model._meta
         aliases = set()
         only_load = self.deferred_to_columns()
 
         if start_alias:
             seen = {None: start_alias}
         for field, model in opts.get_fields_with_model():
+            # For local fields (even if through proxy) the model should
+            # be None.
+            if model == opts.concrete_model:
+                model = None
             if local_only and model is not None:
                 continue
             if start_alias: