diff --git a/awx/main/base_views.py b/awx/main/base_views.py
index 4c67ce051c..9e621004b6 100644
--- a/awx/main/base_views.py
+++ b/awx/main/base_views.py
@@ -52,7 +52,10 @@ class GenericAPIView(generics.GenericAPIView, APIView):
     #   serializer_class = SerializerClass
 
     def get_queryset(self):
-        return self.request.user.get_queryset(self.model)
+        #if hasattr(self.request.user, 'get_queryset'):
+        #    return self.request.user.get_queryset(self.model)
+        #else:
+        return super(GenericAPIView, self).get_queryset()
 
     def get_description_context(self):
         # Set instance attributes needed to get serializer metadata.
@@ -71,6 +74,9 @@ class GenericAPIView(generics.GenericAPIView, APIView):
 class ListAPIView(generics.ListAPIView, GenericAPIView):
     # Base class for a read-only list view.
 
+    def get_queryset(self):
+        return self.request.user.get_queryset(self.model)
+
     def get_description_context(self):
         opts = self.model._meta
         if 'username' in opts.get_all_field_names():