diff --git a/app/client/public/index.html b/app/client/public/index.html
index 5702864a80..94c2ebdaa3 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -16,23 +16,27 @@
       transition: all ease-in 0.3s;
     }
   </style>
-  <script type="text/javascript">
-    // INTERCOM SETUP
-    const APP_ID = "%REACT_APP_INTERCOM_APP_ID%"
-    const CLOUD_HOSTING = "%REACT_APP_CLOUD_HOSTING%"
-    if (APP_ID.length && CLOUD_HOSTING.length) {
-      (function () { var w = window; var ic = w.Intercom; if (typeof ic === "function") { ic('reattach_activator'); ic('update', w.intercomSettings); } else { var d = document; var i = function () { i.c(arguments); }; i.q = []; i.c = function (args) { i.q.push(args); }; w.Intercom = i; var l = function () { var s = d.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = 'https://widget.intercom.io/widget/' + APP_ID; var x = d.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x); }; if (document.readyState === 'complete') { l(); } else if (w.attachEvent) { w.attachEvent('onload', l); } else { w.addEventListener('load', l, false); } } })();
-    }
-  </script>
-  <script async src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"></script>
-  <script>
-    // GA SETUP
-    window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
-    gtag('js', new Date());
+  <% if("%REACT_APP_INTERCOM_APP_ID%"[0] !== "%" && "%REACT_APP_CLOUD_HOSTING%" !== "%") { %>
+    <script type="text/javascript">
+      // INTERCOM SETUP
+      const APP_ID = "%REACT_APP_INTERCOM_APP_ID%"
+      const CLOUD_HOSTING = "%REACT_APP_CLOUD_HOSTING%"
+      if (APP_ID.length && CLOUD_HOSTING.length) {
+        (function () { var w = window; var ic = w.Intercom; if (typeof ic === "function") { ic('reattach_activator'); ic('update', w.intercomSettings); } else { var d = document; var i = function () { i.c(arguments); }; i.q = []; i.c = function (args) { i.q.push(args); }; w.Intercom = i; var l = function () { var s = d.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = 'https://widget.intercom.io/widget/' + APP_ID; var x = d.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x); }; if (document.readyState === 'complete') { l(); } else if (w.attachEvent) { w.attachEvent('onload', l); } else { w.addEventListener('load', l, false); } } })();
+      }
+    </script>
+  <% } %>
+  <% if("%REACT_APP_GOOGLE_ANALYTICS_ID%"[0] !== "%") { %>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=%REACT_APP_GOOGLE_ANALYTICS_ID%"></script>
+    <script>
+      // GA SETUP
+      window.dataLayer = window.dataLayer || [];
+      function gtag() { dataLayer.push(arguments); }
+      gtag('js', new Date());
 
-    gtag('config', "%REACT_APP_GOOGLE_ANALYTICS_ID%");
-  </script>
+      gtag('config', "%REACT_APP_GOOGLE_ANALYTICS_ID%");
+    </script>
+  <% } %>
 </head>
 
 <body>
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index d21e409cfc..06b1c0d821 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -4,7 +4,7 @@ import {
   getApplicationViewerPageURL,
   BUILDER_PAGE_URL,
 } from "constants/routes";
-import { Card, Classes } from "@blueprintjs/core";
+import { Card, Classes, HTMLDivProps, ICardProps } from "@blueprintjs/core";
 import { ApplicationPayload } from "constants/ReduxActionConstants";
 import Button from "components/editorComponents/Button";
 import { theme, getColorWithOpacity } from "constants/DefaultTheme";
@@ -19,11 +19,16 @@ import {
 import { getInitialsAndColorCode, getColorCode } from "utils/AppsmithUtils";
 import { ControlIcons } from "icons/ControlIcons";
 import history from "utils/history";
+import { omit } from "lodash";
 
-const NameWrapper = styled.div<{
+type NameWrapperProps = {
   hasReadPermission: boolean;
   showOverlay: boolean;
-}>`
+};
+
+const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => (
+  <div {...omit(props, ["hasReadPermission", "showOverlay"])} />
+))`
   ${props =>
     props.showOverlay &&
     `
@@ -81,10 +86,14 @@ const Name = styled.div`
   letter-spacing: 0.1px;
 `;
 
-const Wrapper = styled(Card)<{
-  hasReadPermission?: boolean;
-  backgroundColor: string;
-}>`
+const Wrapper = styled(
+  (
+    props: ICardProps & {
+      hasReadPermission?: boolean;
+      backgroundColor: string;
+    },
+  ) => <Card {...omit(props, ["hasReadPermission", "backgroundColor"])} />,
+)`
   display: flex;
   flex-direction: column;
   justify-content: center;
