diff --git a/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6
index 09cd3dba6a5468878e547143ed64aa7c7a95b1b7..3bb01c67206709be61b24bff8492188312fa17ed 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js.es6
@@ -28,10 +28,10 @@
                 <a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a>
               </span>
               <span>
-              by
-              <a :href="issue.author.webUrl" class="issue-author-link">
-                {{ issue.author.name }}
-              </a>
+                by
+                <a :href="issue.author.webUrl" class="issue-author-link">
+                  {{ issue.author.name }}
+                </a>
               </span>
             </div>
             <div class="item-time">
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index 12180c82eae8a628fdf5049eea299276f95381a8..0fb2ebb8c358c002a56cf050c73a2261222a620d 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -1,5 +1,4 @@
 - @no_container = true
-- @cycle_analytics_not_set_up = false
 - page_title "Cycle Analytics"
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag("cycle_analytics/cycle_analytics_bundle.js")
@@ -7,18 +6,19 @@
 = render "projects/pipelines/head"
 
 #cycle-analytics{ class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } }
-  .bordered-box.landing.content-block{"v-if" => "!isOverviewDialogDismissed"}
-    = icon("times", class: "dismiss-icon", "@click" => "dismissOverviewDialog()")
-    .row
-      .col-sm-3.col-xs-12.svg-container
-        = custom_icon('icon_cycle_analytics_splash')
-      .col-sm-8.col-xs-12.inner-content
-        %h4
-          Introducing Cycle Analytics
-        %p
-          Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.
+  - if @cycle_analytics_no_data
+    .bordered-box.landing.content-block{"v-if" => "!isOverviewDialogDismissed"}
+      = icon("times", class: "dismiss-icon", "@click" => "dismissOverviewDialog()")
+      .row
+        .col-sm-3.col-xs-12.svg-container
+          = custom_icon('icon_cycle_analytics_splash')
+        .col-sm-8.col-xs-12.inner-content
+          %h4
+            Introducing Cycle Analytics
+          %p
+            Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.
 
-        = link_to "Read more",  help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn'
+          = link_to "Read more",  help_page_path('user/project/cycle_analytics'), target: '_blank', class: 'btn'
   = icon("spinner spin", "v-show" => "isLoading")
   .wrapper{"v-show" => "!isLoading && !hasError"}
     .panel.panel-default