diff --git a/packages/subapp-web/src/index.js b/packages/subapp-web/src/index.js
index 2f5582d38..ebba57afb 100644
--- a/packages/subapp-web/src/index.js
+++ b/packages/subapp-web/src/index.js
@@ -105,24 +105,35 @@ export function loadSubApp(info, renderStart) {
   return info;
 }
 
-export function dynamicLoadSubApp(options) {
+export function dynamicLoadSubApp({ name, id, timeout = 15000, onLoad, onError }) {
   // TODO: timeout and callback
   const wsa = window.webSubApps;
-  const lname = options.name.toLowerCase();
+  const lname = name.toLowerCase();
 
   if (wsa._bundles[lname] === undefined) {
     window.loadSubAppBundles(lname);
   }
+  const startTime = Date.now();
 
   const load = delay => {
     setTimeout(() => {
-      const subApp = wsa[options.name];
-      const element = document.getElementById(options.id);
-      if (element && subApp && subApp.start) {
-        subApp.start({ id: options.id });
-      } else {
-        load(50);
+      const subApp = wsa[name];
+      if (subApp) {
+        if (!id) {
+          return onLoad();
+        } else {
+          const element = document.getElementById(id);
+          if (element && subApp.start) {
+            return subApp.start({ id });
+          }
+        }
       }
+
+      if (timeout > 50 && Date.now() - startTime > timeout) {
+        return onError(new Error("dynamicLoadSubApp Timeout"));
+      }
+
+      return load(50);
     }, delay);
   };
 
diff --git a/samples/poc-subapp/src/components/deals.jsx b/samples/poc-subapp/src/components/deals.jsx
index c9110858d..9f3641d96 100644
--- a/samples/poc-subapp/src/components/deals.jsx
+++ b/samples/poc-subapp/src/components/deals.jsx
@@ -3,6 +3,46 @@ import { dynamicLoadSubApp } from "subapp-web";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 
+class SubApp extends React.Component {
+  constructor() {
+    super();
+    this.state = { ready: false };
+  }
+
+  render() {
+    // is subapp loaded?
+    // TODO: handle SSR
+    if (typeof window === "undefined") {
+      return "";
+    }
+    const { name } = this.props;
+    const wsa = window.webSubApps;
+    const lname = name.toLowerCase();
+
+    if (wsa._bundles[lname] && wsa[name]) {
+      const subapp = window.webSubApps[name];
+      return (
+        <div className="col-sm-4">
+          <div className="panel panel-primary">
+            <div className="panel-body">
+              <subapp.info.Component {...this.props} />
+            </div>
+          </div>
+        </div>
+      );
+    } else {
+      const onLoad = () => this.setState({ ready: true });
+      dynamicLoadSubApp({
+        name: "Deal",
+        onLoad
+      });
+
+      // if not, return loadingComponent
+      return "";
+    }
+  }
+}
+
 const DealSubApp = props => {
   const { id } = props;
 
@@ -47,6 +87,9 @@ const Deals = props => {
         <DealSubApp {...props} id="deal_2" />
         <DealSubApp {...props} id="deal_3" />
       </div>
+      <div>
+        <SubApp name="Deal" deal="hello" />
+      </div>
     </div>
   );
 };
diff --git a/samples/poc-subapp/src/deal/subapp-deal.jsx b/samples/poc-subapp/src/deal/subapp-deal.jsx
index 33c88e191..747be1cb2 100644
--- a/samples/poc-subapp/src/deal/subapp-deal.jsx
+++ b/samples/poc-subapp/src/deal/subapp-deal.jsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { loadSubApp } from "subapp-web";
 
-const Deal = () => {
-  return <div>SPECIAL DEAL - SPECIAL DEAL</div>;
+const Deal = props => {
+  return <div>SPECIAL DEAL - SPECIAL DEAL - {props.deal}</div>;
 };
 
 export default loadSubApp({ name: "Deal", Component: Deal });