diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index e75f9a08ab..aba4906680 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -35,7 +35,11 @@ export const loadBudibase = async ({
         props = appDefinition.props;
     }
 
-    const _app = createApp(componentLibraries, appDefinition,  user, uiFunctions);
+    const _app = createApp(
+        componentLibraries, 
+        appDefinition,  
+        user, 
+        uiFunctions || {});
     _app.hydrateChildren(
         [props],
         window.document.body);
diff --git a/packages/client/src/render/renderComponent.js b/packages/client/src/render/renderComponent.js
index 890ed4037f..3ed66ac517 100644
--- a/packages/client/src/render/renderComponent.js
+++ b/packages/client/src/render/renderComponent.js
@@ -4,7 +4,10 @@ export const renderComponent = ({
     htmlElement, anchor, parentContext,
     componentProps}) => {
 
-    const func = uiFunctions[componentProps._id];
+    const func = componentProps._id 
+                 ? uiFunctions[componentProps._id]
+                 : undefined;
+                 
     let component;
     let componentContext;
     const render = (context) => {