diff --git a/lib/providers/oscilloscope_state_provider.dart b/lib/providers/oscilloscope_state_provider.dart
index 0647a6a95..ea69ca636 100644
--- a/lib/providers/oscilloscope_state_provider.dart
+++ b/lib/providers/oscilloscope_state_provider.dart
@@ -12,6 +12,7 @@ import 'package:pslab/others/logger_service.dart';
 import 'package:pslab/others/oscilloscope_axes_scale.dart';
 import 'package:pslab/providers/locator.dart';
 import 'package:pslab/providers/oscilloscope_config_provider.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../communication/analytics_class.dart';
 import '../communication/science_lab.dart';
@@ -97,6 +98,7 @@ class OscilloscopeStateProvider extends ChangeNotifier {
   List<List<dynamic>> _recordedData = [];
   late int _timebaseDivisions;
   int get timebaseDivisions => _timebaseDivisions;
+  bool _wakelockEnabled = false;
 
   late double timebaseSlider;
 
@@ -242,6 +244,10 @@ class OscilloscopeStateProvider extends ChangeNotifier {
 
           if (_scienceLab.isConnected() && isXYPlotSelected) {
             await xyPlotTask(xyPlotAxis1, xyPlotAxis2);
+            if (!_wakelockEnabled) {
+              WakelockPlus.enable();
+              _wakelockEnabled = true;
+            }
           } else {
             if (_scienceLab.isConnected()) {
               if (isCH1Selected) {
@@ -259,8 +265,16 @@ class OscilloscopeStateProvider extends ChangeNotifier {
               channels.add('MIC');
             }
             if (channels.isNotEmpty) {
+              if (!_wakelockEnabled) {
+                WakelockPlus.enable();
+                _wakelockEnabled = true;
+              }
               await captureTask(channels);
             } else {
+              if (_wakelockEnabled) {
+                WakelockPlus.disable();
+                _wakelockEnabled = false;
+              }
               resetGraph();
               dataEntries = [];
             }
@@ -773,6 +787,10 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     _playbackData = null;
     _playbackIndex = 0;
 
+    if (_wakelockEnabled) {
+      WakelockPlus.disable();
+      _wakelockEnabled = false;
+    }
     dataEntries.clear();
     notifyListeners();
     onPlaybackEnd?.call();
@@ -786,6 +804,10 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     _playbackData = data;
     _playbackIndex = 1;
 
+    if (!_wakelockEnabled) {
+      WakelockPlus.enable();
+      _wakelockEnabled = true;
+    }
     _timer.cancel();
 
     dataEntries.clear();
@@ -797,6 +819,10 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     if (_isPlayingBack) {
       _isPlaybackPaused = true;
       _playbackTimer?.cancel();
+      if (_wakelockEnabled) {
+        WakelockPlus.disable();
+        _wakelockEnabled = false;
+      }
       notifyListeners();
     }
   }
@@ -804,6 +830,10 @@ class OscilloscopeStateProvider extends ChangeNotifier {
   void resumePlayback() {
     if (_isPlayingBack && _isPlaybackPaused) {
       _isPlaybackPaused = false;
+      if (!_wakelockEnabled) {
+        WakelockPlus.enable();
+        _wakelockEnabled = true;
+      }
       _startPlaybackTimer();
       notifyListeners();
     }
@@ -1004,12 +1034,18 @@ class OscilloscopeStateProvider extends ChangeNotifier {
   }
 
   void resetGraph() {
+    if (dataEntries.isEmpty &&
+        dataEntriesXYPlot.isEmpty &&
+        dataEntriesCurveFit.isEmpty) {
+      return;
+    }
     oscilloscopeAxesScale.setYAxisScaleMax(oscilloscopeAxesScale.yAxisScale);
     oscilloscopeAxesScale.setYAxisScaleMin(-oscilloscopeAxesScale.yAxisScale);
     oscilloscopeAxesScale.setXAxisScale(timebase);
     dataEntries = [];
     dataEntriesXYPlot = [];
     dataEntriesCurveFit = [];
+    notifyListeners();
   }
 
   @override
@@ -1018,6 +1054,9 @@ class OscilloscopeStateProvider extends ChangeNotifier {
     if (_timer.isActive) {
       _timer.cancel();
     }
+    if (_wakelockEnabled) {
+      WakelockPlus.disable();
+    }
     _audioJack.close();
     super.dispose();
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index f65c60bab..017689c39 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -72,6 +72,7 @@ dependencies:
   flutter_map: ^8.2.1
   latlong2: ^0.9.1
   geolocator: ^14.0.2
+  wakelock_plus: ^1.3.3
 
 dependency_overrides:
   ffi: ^2.1.3