diff --git a/entries/views.py b/entries/views.py
index af32964bc0eabc19cfd5bd0424f991528e9dfd1e..acd28b7980106d587edd515865cccdb704f8d910 100644
--- a/entries/views.py
+++ b/entries/views.py
@@ -505,7 +505,7 @@ def get_entries(request):
                         }
                         if with_lexical_units else {}
                     ),
-                } for e in entries[first_index:last_index]
+                } for e in (entries if with_lexical_units else entries[first_index:last_index])
             ],
         }
 
@@ -515,15 +515,15 @@ def get_entries(request):
                 lexicalUnits = entry['lexical_units']
                 filteredLexicalUnits = []
                 for lexicalUnit in lexicalUnits:
-                    if (exclude_status == None or lexicalUnit['status'] != exclude_status) and \
-                            (restrict_to_user == None or lexicalUnit['assignee_username'] == restrict_to_user) and \
+                    if (exclude_status is None or lexicalUnit['status'] != exclude_status) and \
+                            (restrict_to_user is None or lexicalUnit['assignee_username'] == restrict_to_user) and \
                                 (has_unified_frame != 'true' or lexicalUnit['unified_frame_id'] != -1):
                         filteredLexicalUnits.append(lexicalUnit)
                 entry['lexical_units'] = filteredLexicalUnits
                 if len(filteredLexicalUnits) > 0:
                     filteredData.append(entry)
 
-            result['data'] = filteredData
+            result['data'] = filteredData[first_index:last_index]
 
         return JsonResponse(result)
     return JsonResponse({})