diff --git a/Source/MoCapPlugin/MoCapPlugin.Build.cs b/Source/MoCapPlugin/MoCapPlugin.Build.cs
index b8e5603ee64cf127813a1d0dbf4c341da0d7e073..330ed6b71507225b127d4bd9576e96932d59a2e3 100644
--- a/Source/MoCapPlugin/MoCapPlugin.Build.cs
+++ b/Source/MoCapPlugin/MoCapPlugin.Build.cs
@@ -19,7 +19,6 @@ public class MoCapPlugin : ModuleRules
 			{
 				"Core",
 				"UMG",
-				//"NDisplayLaunchButton",
 				"RWTHVRToolkit",
 				"SteamVR",
 				"SteamVRInputDevice",
diff --git a/Source/MoCapPlugin/Private/MCController.cpp b/Source/MoCapPlugin/Private/MCController.cpp
index 35ed5f26ecfa66cb453a751aa010fa84c10f7e21..da7b0f6fd67ba447ea43b8e37b14c95cf859b481 100644
--- a/Source/MoCapPlugin/Private/MCController.cpp
+++ b/Source/MoCapPlugin/Private/MCController.cpp
@@ -166,7 +166,7 @@ void AMCController::SaveToAnimMode() {
 				InstructionWidget->FeedbackText->SetText(FText::FromString("Saved!"));
 				InstructionWidget->WidgetSwitcher->SetActiveWidgetIndex(InstructionWidget->StartIndex);
 			}
-			if (GEngine) {
+			if (GEngine && OutputMsgOnScreen) {
 				GEngine->AddOnScreenDebugMessage(-1, 15.0f, FColor::Green, FString::Printf(TEXT("Animation Saved!")));
 			}
 		}
@@ -1636,7 +1636,7 @@ void AMCController::SaveAnimation(float StartHaltingPoint, float EndHaltingPoint
 	if (InstructionWidget) {
 		InstructionWidget->WidgetSwitcher->SetActiveWidgetIndex(InstructionWidget->SavingIndex);
 	}
-	if (GEngine) {
+	if (GEngine && OutputMsgOnScreen) {
 		GEngine->AddOnScreenDebugMessage(-1, 15.0f, FColor::Green, FString::Printf(TEXT("Saving Animation...")));
 	}