diff --git a/ui/v2.5/src/components/FrontPage/Control.tsx b/ui/v2.5/src/components/FrontPage/Control.tsx
index d8e17c4ed..c655d9c3e 100644
--- a/ui/v2.5/src/components/FrontPage/Control.tsx
+++ b/ui/v2.5/src/components/FrontPage/Control.tsx
@@ -167,6 +167,10 @@ interface IProps {
 export const Control: React.FC<IProps> = ({ content }) => {
   switch (content.__typename) {
     case "SavedFilter":
+      if (!(content as ISavedFilterRow).savedFilterId) {
+        return <div>Error: missing savedFilterId</div>;
+      }
+
       return (
         <SavedFilterResults
           savedFilterID={(content as ISavedFilterRow).savedFilterId.toString()}