diff --git a/src/components/charts/CandleChart.vue b/src/components/charts/CandleChart.vue
index 9fa0acb0..9322aa93 100644
--- a/src/components/charts/CandleChart.vue
+++ b/src/components/charts/CandleChart.vue
@@ -90,7 +90,7 @@ export default class CandleChart extends Vue {
       return {};
     }
 
-    console.log(`Available Columns: ${this.dataset.columns}`);
+    // console.log(`Available Columns: ${this.dataset.columns}`);
     // Find default columns (sequence might be different, depending on the strategy)
     const colDate = this.dataset.columns.findIndex((el) => el === '__date_ts');
     const colOpen = this.dataset.columns.findIndex((el) => el === 'open');
diff --git a/src/components/charts/CandleChartContainer.vue b/src/components/charts/CandleChartContainer.vue
index 1a435193..e052240a 100644
--- a/src/components/charts/CandleChartContainer.vue
+++ b/src/components/charts/CandleChartContainer.vue
@@ -17,7 +17,7 @@
       <div class="col-mb-2 ml-2 mr-2">
         <b-button :disabled="!!!pair" size="sm" @click="refresh">&#x21bb;</b-button>
       </div>
-      <div class="col-mb-2 ml-2 mr-2">
+      <div v-if="hasDataset" class="col-mb-2 ml-2 mr-2">
         <small>Buysignals: {{ dataset.buy_signals }}</small>
         <small class="ml-2">SellSignals: {{ dataset.sell_signals }}</small>
       </div>
@@ -118,6 +118,10 @@ export default class CandleChartContainer extends Vue {
     return this.dataset ? this.dataset.columns : [];
   }
 
+  get hasDataset(): boolean {
+    return !!this.dataset;
+  }
+
   mounted() {
     this.plotConfigName = getPlotConfigName();
     this.plotConfig = getCustomPlotConfig(this.plotConfigName);