diff --git a/src/core/Core.js b/src/core/Core.js
index 5d1fafbe1..813bfe2ea 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -33,7 +33,8 @@ class Uppy {
         uppyServerError: 'Connection with Uppy Server failed',
         failedToUpload: 'Failed to upload',
         noInternetConnection: 'No Internet connection',
-        connectedToInternet: 'Connected to the Internet'
+        connectedToInternet: 'Connected to the Internet',
+        noFilesFound: 'You have no files or folders here'
       }
     }
 
diff --git a/src/scss/_provider.scss b/src/scss/_provider.scss
index cd94b6e86..4bb128e8b 100644
--- a/src/scss/_provider.scss
+++ b/src/scss/_provider.scss
@@ -1,6 +1,7 @@
 .uppy-Provider-auth,
 .uppy-Provider-error,
-.uppy-Provider-loading {
+.uppy-Provider-loading,
+.uppy-Provider-empty {
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/src/views/ProviderView/Browser.js b/src/views/ProviderView/Browser.js
index 16fcbb482..bb7136a3a 100644
--- a/src/views/ProviderView/Browser.js
+++ b/src/views/ProviderView/Browser.js
@@ -46,7 +46,8 @@ module.exports = (props) => {
         handleScroll: props.handleScroll,
         title: props.title,
         showTitles: props.showTitles,
-        getItemId: props.getItemId
+        getItemId: props.getItemId,
+        i18n: props.i18n
       })}
       <button class="UppyButton--circular UppyButton--blue uppy-ProviderBrowser-doneBtn"
         type="button"
diff --git a/src/views/ProviderView/ItemList.js b/src/views/ProviderView/ItemList.js
index 1d3a08872..0713d957c 100644
--- a/src/views/ProviderView/ItemList.js
+++ b/src/views/ProviderView/ItemList.js
@@ -2,17 +2,9 @@ const Row = require('./Item')
 const { h } = require('preact')
 
 module.exports = (props) => {
-  // const headers = props.columns.map((column) => {
-  //   return html`
-  //     <th class="uppy-ProviderBrowserTable-headerColumn uppy-ProviderBrowserTable-column" onclick=${props.sortByTitle}>
-  //       ${column.name}
-  //     </th>
-  //   `
-  // })
-
-  // <thead class="uppy-ProviderBrowserTable-header">
-  //   <tr>${headers}</tr>
-  // </thead>
+  if (!props.folders.length && !props.files.length) {
+    return <div class="uppy-Provider-empty">{props.i18n('noFilesFound')}</div>
+  }
 
   return (
     <div class="uppy-ProviderBrowser-body">
diff --git a/src/views/ProviderView/index.js b/src/views/ProviderView/index.js
index caff990a3..9140f2b73 100644
--- a/src/views/ProviderView/index.js
+++ b/src/views/ProviderView/index.js
@@ -590,7 +590,8 @@ module.exports = class ProviderView {
       showTitles: this.opts.showTitles,
       showFilter: this.opts.showFilter,
       showBreadcrumbs: this.opts.showBreadcrumbs,
-      pluginIcon: this.plugin.icon
+      pluginIcon: this.plugin.icon,
+      i18n: this.plugin.uppy.i18n
     })
 
     return Browser(browserProps)