diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
index df127bf3651a..d493b32bc013 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx
@@ -48,14 +48,6 @@ const CollectionHeader = ({
         onUpdateCollection={onUpdateCollection}
       />
       <HeaderActions data-testid="collection-menu">
-        {showUploadButton && (
-          <CollectionUpload
-            collection={collection}
-            uploadsEnabled={uploadsEnabled}
-            isAdmin={isAdmin}
-            saveFile={saveFile}
-          />
-        )}
         {!isInstanceAnalytics && <CollectionTimeline collection={collection} />}
         {isInstanceAnalytics && (
           <CollectionPermissions collection={collection} />
diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.ts
index ba271e08d2a6..2e356cdecc50 100644
--- a/frontend/src/metabase/dashboard/actions/tabs.ts
+++ b/frontend/src/metabase/dashboard/actions/tabs.ts
@@ -513,6 +513,9 @@ export const tabsReducer = createReducer<DashboardState>(
     );
 
     builder.addCase(Dashboards.actionTypes.UPDATE, (state, { payload }) => {
+      if (!payload.dashboard) {
+        return;
+      }
       const { dashcards: newDashcards, tabs: newTabs } = payload.dashboard;
 
       const { prevDash, prevTabs } = getPrevDashAndTabs({
@@ -536,7 +539,7 @@ export const tabsReducer = createReducer<DashboardState>(
         const prevDashcardData = state.dashcardData[prevId];
 
         if (prevDashcardData) {
-          state.dashcardData[newDashcards[index].id] = prevDashcardData;
+          state.dashcardData[newDashcards[index]?.id] = prevDashcardData;
         }
       });
 
diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.ts
index 695cc1a3ecf5..b110ac9490e1 100644
--- a/frontend/src/metabase/redux/user.ts
+++ b/frontend/src/metabase/redux/user.ts
@@ -56,6 +56,7 @@ export const currentUser = createReducer<User | null>(null, builder => {
       const { dashboard } = payload;
       if (
         state != null &&
+        dashboard != null &&
         state.custom_homepage?.dashboard_id === dashboard.id &&
         dashboard.archived
       ) {
diff --git a/frontend/src/metabase/sharing/components/PulsesListSidebar.jsx b/frontend/src/metabase/sharing/components/PulsesListSidebar.jsx
index b8a4c79fbb9d..b9141750d832 100644
--- a/frontend/src/metabase/sharing/components/PulsesListSidebar.jsx
+++ b/frontend/src/metabase/sharing/components/PulsesListSidebar.jsx
@@ -19,7 +19,7 @@ import {
 import { getActivePulseParameters } from "metabase/lib/pulse";
 import { formatFrame } from "metabase/lib/time";
 import { Icon } from "metabase/ui";
-import { getUser } from "metabase/home/selectors";
+import { getUser } from "metabase/selectors/user";
 import Settings from "metabase/lib/settings";
 
 import { PulseCard, SidebarActions } from "./PulsesListSidebar.styled";
diff --git a/src/metabase/models/dashboard.clj b/src/metabase/models/dashboard.clj
index 4c116e2ccd0e..c40dbbbe6666 100644
--- a/src/metabase/models/dashboard.clj
+++ b/src/metabase/models/dashboard.clj
@@ -210,7 +210,9 @@
                                       [:collection :collection] [:= :collection.id :card.collection_id]]
                           :where     [:and
                                       [:in :dashcard.dashboard_id (map :id dashboards)]
-                                      [:= :card.simpro_removed false]
+                                      [:or
+                                       [:= :card.simpro_removed false]
+                                       [:= :card.simpro_removed nil]] ;handle virtual cards
                                       [:or
                                        [:= :card.archived false]
                                        [:= :card.archived nil]]] ; e.g. DashCards with no corresponding Card, e.g. text Cards