diff --git a/frontend/src/metabase/admin/permissions/routes.jsx b/frontend/src/metabase/admin/permissions/routes.jsx
index 1f6a667d0cba6062d7c8784e7aeb40c6d5695f9f..b9ba8ae07726075aed877b27fc8c37240e656b6d 100644
--- a/frontend/src/metabase/admin/permissions/routes.jsx
+++ b/frontend/src/metabase/admin/permissions/routes.jsx
@@ -31,7 +31,7 @@ const getRoutes = store => (
       </Route>
 
       {/* TABLES NO SCHEMA */}
-      {/* NOTE: this route is to support null schemas, inject the empty string as the schemaName */}
+      {/* NOTE: this route is to support null schemas */}
       <Route
         path=":databaseId/tables"
         component={(
@@ -39,7 +39,7 @@ const getRoutes = store => (
         ) => (
           <TablesPermissionsApp
             {...props}
-            params={{ ...props.params, schemaName: "" }}
+            params={{ ...props.params, schemaName: null }}
           />
         )}
       >
diff --git a/frontend/src/metabase/admin/permissions/selectors.js b/frontend/src/metabase/admin/permissions/selectors.js
index 965b36cfa0a7e7b5fbcdcf5487091a3900993c90..9ff1b4be987ea8288259a47b83b7666ac3a4c1d7 100644
--- a/frontend/src/metabase/admin/permissions/selectors.js
+++ b/frontend/src/metabase/admin/permissions/selectors.js
@@ -662,7 +662,7 @@ export const getDatabasesPermissionsGrid = createSelector(
           },
           name: database.name,
           link:
-            schemas.length === 0 || (schemas.length === 1 && schemas[0] === "")
+            schemas.length === 0 || (schemas.length === 1 && schemas[0] == null)
               ? {
                   name: t`View tables`,
                   url: `/admin/permissions/databases/${database.id}/tables`,