diff --git a/Software/PC_Application/LibreVNA-GUI/modehandler.cpp b/Software/PC_Application/LibreVNA-GUI/modehandler.cpp
index c927e4e..af5a7e4 100644
--- a/Software/PC_Application/LibreVNA-GUI/modehandler.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/modehandler.cpp
@@ -74,7 +74,9 @@ void ModeHandler::activate(Mode * mode)
 
 void ModeHandler::deactivate(Mode* mode)
 {
-    mode->deactivate();
+    if(mode) {
+        mode->deactivate();
+    }
     activeMode = nullptr;
 }