diff --git a/client/react-native/common/components/Library/Screen.js b/client/react-native/common/components/Library/Screen.js
index 605ab751fb..c740fe34a3 100644
--- a/client/react-native/common/components/Library/Screen.js
+++ b/client/react-native/common/components/Library/Screen.js
@@ -1,4 +1,5 @@
-import { Dimensions, View } from 'react-native'
+import { Dimensions } from 'react-native'
+import { SafeAreaView } from 'react-navigation'
 import React, { Component } from 'react'
 
 import { screen, colors } from '../../constants'
@@ -39,7 +40,7 @@ export default class Screen extends Component {
     const { absolute, style, onResize, ...props } = this.props
     const { dimensions } = this.state
     return (
-      <View
+      <SafeAreaView
         style={[
           {
             flex: 1,
diff --git a/client/react-native/common/relay/Pagination.js b/client/react-native/common/relay/Pagination.js
index 664a55d81f..f7b5dc4284 100644
--- a/client/react-native/common/relay/Pagination.js
+++ b/client/react-native/common/relay/Pagination.js
@@ -64,7 +64,7 @@ class PaginationContainer extends Component {
       condComponent,
     } = this.props
 
-    if (data[alias] && data[alias].edges.length > 0) {
+    if (!emptyItem || (data[alias] && data[alias].edges.length > 0)) {
       return (
         <>
           <FlatList