diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index 7fea3374c5..d8f840e434 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -214,15 +214,16 @@ class HomePage extends React.Component {
                                   </OverlayTrigger>
                                 </Link>
                                 <Link
-                                  to={`/applications/${app.slug}`}
-                                  target="_blank"
+                                  to={app?.current_version_id ? `/applications/${app.slug}` : '' }
+                                  
+                                  target={app?.current_version_id ? '_blank' : ''}
                                 >
                                   <OverlayTrigger
                                     placement="top"
-                                    overlay={(props) => renderTooltip({props, text: 'Open in app viewer'})}
+                                    overlay={(props) => renderTooltip({props, text: app?.current_version_id == null ? 'App does not have a deployed version' : 'Open in app viewer'})}
                                   >
-                                    <span className="badge bg-blue-lt mx-2">launch</span>
-
+                                    <span className={`${app?.current_version_id ? 'badge bg-blue-lt mx-2 ' : 'badge bg-light-grey mx-2'}`} 
+                                    >launch </span>
                                   </OverlayTrigger>
                                 </Link>