diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.html b/pdb-js/src/app/visualization-page/visualization-page.component.html
index 0919078..0062ea7 100644
--- a/pdb-js/src/app/visualization-page/visualization-page.component.html
+++ b/pdb-js/src/app/visualization-page/visualization-page.component.html
@@ -33,13 +33,6 @@
       
       <pdb-limit-by #limitbycomponent></pdb-limit-by>
       
-      <mat-form-field>
-        <mat-label>Y-Axis:</mat-label>
-        <mat-select [(value)]="yAxisScale">
-          <mat-option value="LOG10">Logarithm</mat-option>
-          <mat-option value="LINEAR">Linear</mat-option>
-        </mat-select>
-      </mat-form-field>
       
      <pdb-y-axis-definition #yAxisDefinitionComponent></pdb-y-axis-definition>
      
diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.ts b/pdb-js/src/app/visualization-page/visualization-page.component.ts
index a875a88..5e2d635 100644
--- a/pdb-js/src/app/visualization-page/visualization-page.component.ts
+++ b/pdb-js/src/app/visualization-page/visualization-page.component.ts
@@ -30,8 +30,6 @@ export class VisualizationPageComponent implements OnInit {
   
   @ViewChild(LimitByComponent, {static: false})
   private limitbycomponent : LimitByComponent;
-    
-  yAxisScale: string;
   
   @ViewChild(YAxisDefinitionComponent, {static: false})
   private yAxisDefinitionComponent : YAxisDefinitionComponent;
@@ -75,7 +73,6 @@ export class VisualizationPageComponent implements OnInit {
       that.groupBy = that.tagFields.filter(val => filterDefaults.groupBy.includes(val.name));
       that.splitBy = that.tagFields.find(val => filterDefaults.splitBy == val.name);
     });
-    this.yAxisScale = "LOG10";
   }
   
   changePlotType(selectedPlotTypes: Array<PlotType>) {
@@ -150,10 +147,10 @@ export class VisualizationPageComponent implements OnInit {
     request.limitBy = this.limitbycomponent.limitBy;
     request.limit = this.limitbycomponent.limit;
     request.dateRange = this.dateRangeAsString(); 
-    request.axisScale = this.yAxisScale;
     request.aggregates = aggregates; 
     request.keyOutside = false;
     request.generateThumbnail = this.enableGallery;
+    request.axisScale = this.yAxisDefinitionComponent.yAxisScale;
     request.yRangeMin = this.yAxisDefinitionComponent.minYValue;
     request.yRangeMax = this.yAxisDefinitionComponent.maxYValue;
     request.yRangeUnit = this.yAxisDefinitionComponent.yAxisUnit;
diff --git a/pdb-js/src/app/y-axis-definition/y-axis-definition.component.html b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.html
index 35b12be..43c1fac 100644
--- a/pdb-js/src/app/y-axis-definition/y-axis-definition.component.html
+++ b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.html
@@ -1,4 +1,13 @@
 <div>
+  
+    <mat-form-field>
+      <mat-label>Y-Axis:</mat-label>
+      <mat-select [(value)]="yAxisScale">
+        <mat-option value="LOG10">Logarithm</mat-option>
+        <mat-option value="LINEAR">Linear</mat-option>
+      </mat-select>
+    </mat-form-field>
+
    <mat-form-field class="pdb-form-mid">
     <mat-label>Y-Axis Range:</mat-label>
     <mat-select [(value)]="yAxisUnit">
diff --git a/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts
index 5ab4a39..b8adc41 100644
--- a/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts
+++ b/pdb-js/src/app/y-axis-definition/y-axis-definition.component.ts
@@ -7,6 +7,8 @@ import { Component,  Input } from '@angular/core';
 })
 export class YAxisDefinitionComponent {
 
+
+  yAxisScale: string = "LOG10";
   yAxisUnit: string = "SECONDS";
   minYValue: number = 0;
   maxYValue: number = 300;