diff --git a/apis/nucleus/src/components/Cell.jsx b/apis/nucleus/src/components/Cell.jsx
index 426ff06e2..5e8b49ec4 100644
--- a/apis/nucleus/src/components/Cell.jsx
+++ b/apis/nucleus/src/components/Cell.jsx
@@ -569,7 +569,7 @@ const Cell = forwardRef(
           >
             {Content}
           </Grid>
-          <Footer layout={layout} titleStyles={titleStyles} />
+          {cellNode && layout && state.sn && <Footer layout={layout} titleStyles={titleStyles} />}
         </Grid>
         {state.longRunningQuery && <LongRunningQuery canCancel={canCancel} canRetry={canRetry} api={longrunning} />}
       </Paper>
diff --git a/apis/nucleus/src/sn/__tests__/types.test.js b/apis/nucleus/src/sn/__tests__/types.test.js
index 3d8306c4f..5125efafd 100644
--- a/apis/nucleus/src/sn/__tests__/types.test.js
+++ b/apis/nucleus/src/sn/__tests__/types.test.js
@@ -101,9 +101,9 @@ describe('types', () => {
       expect(v).toEqual('1.5.1');
     });
 
-    test('should return null when no fit is found', () => {
+    test('should return undefined when no fit is found', () => {
       const v = c.getSupportedVersion('pie', '1.2.0');
-      expect(v).toBe(null);
+      expect(v).toBe(undefined);
     });
 
     test('should return the requested type and version', () => {
diff --git a/apis/nucleus/src/sn/types.js b/apis/nucleus/src/sn/types.js
index 7cbda8f61..4ed0d2a2f 100644
--- a/apis/nucleus/src/sn/types.js
+++ b/apis/nucleus/src/sn/types.js
@@ -66,7 +66,7 @@ export function create({ halo, parent }) {
     },
     getSupportedVersion: (name, propertyVersion) => {
       if (!tc[name]) {
-        return null;
+        return undefined;
       }
       return tc[name].getMatchingVersionFromProperties(propertyVersion);
     },