diff --git a/src/qudi/gui/terascan/terascan_gui.py b/src/qudi/gui/terascan/terascan_gui.py
index 5c4be30..d23ed71 100644
--- a/src/qudi/gui/terascan/terascan_gui.py
+++ b/src/qudi/gui/terascan/terascan_gui.py
@@ -6,6 +6,7 @@
 import os
 from PySide2 import QtCore, QtGui
 from typing import List
+from time import sleep
 
 from qudi.util.datastorage import TextDataStorage
 from qudi.core.module import GuiBase
@@ -54,9 +55,11 @@ def on_activate(self) -> None:
         self._mw.stop_wavelength.setValue(self._stop_wavelength)
 
         for txt, scan_type in self._terascan_logic().scan_types.items():
+            print(txt, scan_type)
             self._mw.scan_type.addItem(txt, scan_type)
         for txt, scan_rate in self._terascan_logic().scan_rates.items():
             self._mw.scan_rate.addItem(txt, scan_rate)
+            print(txt, scan_rate)
 
         # connect all GUI internal signals
         self._mw.start_wavelength.valueChanged.connect(self._start_changed)
@@ -98,7 +101,7 @@ def on_activate(self) -> None:
         )
 
         self.sigSetScanType.connect(
-            self._terascan_logic().set_scan_type, QtCore.Qt.QueuedConnection
+            self._terascan_logic().set_scan_type, QtCore.Qt.DirectConnection # this is direct on purpose
         )
 
         self.sigSetScanRate.connect(
@@ -178,7 +181,6 @@ def _scan_type_changed(self, _: int):
         """ Qt slot to be called upon scan type change """
         
         self.sigSetScanType.emit(self._mw.scan_type.currentData().value)
-
         # When type changes, update UI for allowed rates
         self._mw.scan_rate.clear()  # Clear previous rates
         for txt, scan_rate in self._terascan_logic().scan_rates.items():
diff --git a/src/qudi/hardware/laser/solstis_laser.py b/src/qudi/hardware/laser/solstis_laser.py
index 46087c7..5bbc200 100644
--- a/src/qudi/hardware/laser/solstis_laser.py
+++ b/src/qudi/hardware/laser/solstis_laser.py
@@ -55,8 +55,8 @@ class SolstisLaser(ScanningLaserInterface):
     _start_wavelength = StatusVar('start_wavelength', default=0.78)
     _end_wavelength = StatusVar('end_wavelength', default=0.785)
 
-    _scan_type = StatusVar('scan_type', default=2)
-    _scan_rate = StatusVar('scan_rate', default=13)
+    _scan_type = StatusVar('scan_type', default=TeraScanType.SCAN_TYPE_FINE)
+    _scan_rate = StatusVar('scan_rate', default=TeraScanRate.SCAN_RATE_FINE_LINE_20_GHZ)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/src/qudi/logic/terascan_logic.py b/src/qudi/logic/terascan_logic.py
index c13c91a..1fefc9b 100644
--- a/src/qudi/logic/terascan_logic.py
+++ b/src/qudi/logic/terascan_logic.py
@@ -100,7 +100,7 @@ def on_activate(self):
         self.sigConfigureCounter.connect(counter.configure, QtCore.Qt.QueuedConnection)
         self.sigSetLaserWavelengths.connect(laser.set_wavelengths, QtCore.Qt.QueuedConnection)
         self.sigSetLaserScanRate.connect(laser.set_scan_rate, QtCore.Qt.QueuedConnection)
-        self.sigSetLaserScanType.connect(laser.set_scan_type, QtCore.Qt.QueuedConnection)
+        self.sigSetLaserScanType.connect(laser.set_scan_type, QtCore.Qt.DirectConnection) # Is direct on purpose
         
         self.sigStartScan.connect(counter.start_measure, QtCore.Qt.QueuedConnection)
         self.sigStartScan.connect(laser.start_scan, QtCore.Qt.QueuedConnection)
@@ -188,7 +188,7 @@ def set_scan_type(self, scan_type: int):
                 self._scan_type = scan_type
                 self.sigSetLaserScanType.emit(scan_type)
 
-                self._scan_rate = list(self._laser().get_scan_rates(scan_type))[0]
+                self._scan_rate = list(self._laser().get_scan_rates.values())[0].value
                 self.sigSetLaserScanRate.emit(self._scan_rate)
                 
             else: