diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
index 79f70b6..bc30c98 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
@@ -78,7 +78,9 @@ public class MainActivity extends AppCompatActivity {
                             detectorService.videoDetector.startDetection();
                         }
                     } else {
-                        detectorService.videoDetector.stopDetection();
+                        if(detectorService != null) {
+                            detectorService.videoDetector.stopDetection();
+                        }
                     }
                 }
             });
@@ -86,9 +88,13 @@ public class MainActivity extends AppCompatActivity {
                 @Override
                 public void onClick(View v) {
                     if (toggleAudio.isChecked()) {
-
+                        if(detectorService != null) {
+                            detectorService.audioDetector.startDetection();
+                        }
                     } else {
-
+                        if(detectorService != null) {
+                            detectorService.audioDetector.stopDetection();
+                        }
                     }
                 }
             });
@@ -96,9 +102,13 @@ public class MainActivity extends AppCompatActivity {
                 @Override
                 public void onClick(View v) {
                     if (toggleBewegung.isChecked()) {
-
+                        if(detectorService != null) {
+                            detectorService.motionDetector.startDetection();
+                        }
                     } else {
-
+                        if(detectorService != null) {
+                            detectorService.motionDetector.stopDetection();
+                        }
                     }
                 }
             });