diff --git a/Content/HUD/BP_SF_HUD_Widget.uasset b/Content/HUD/BP_SF_HUD_Widget.uasset
index 1bc6edb52ec1f3090e27609784713749f19ded33..3af8859c986e153026a5717b59f30eb5f1393f44 100644
Binary files a/Content/HUD/BP_SF_HUD_Widget.uasset and b/Content/HUD/BP_SF_HUD_Widget.uasset differ
diff --git a/Source/StudyFrameworkPlugin/Private/HUD/SFHUDWidget.cpp b/Source/StudyFrameworkPlugin/Private/HUD/SFHUDWidget.cpp
index 59408cfd1188ee136caa24478abb99947e3c9d75..df79be05cdd19a398f010f07d1872966a07d36f3 100644
--- a/Source/StudyFrameworkPlugin/Private/HUD/SFHUDWidget.cpp
+++ b/Source/StudyFrameworkPlugin/Private/HUD/SFHUDWidget.cpp
@@ -57,14 +57,14 @@ void USFHUDWidget::SetStatus(const FString& Text)
 
 void USFHUDWidget::SetbInDebugMode(bool InDebugMode) {
 	bInDebugMode = InDebugMode;
-	if (bInDebugModeTextBox){
+	if (InDebugModeBorder && InDebugModeText){
 		if (bInDebugMode) {
-			bInDebugModeTextBox->SetText(FText::FromString("DEBUG MODE ||"));
-			bInDebugModeTextBox->SetColorAndOpacity(UKismetMathLibrary::MakeColor(0, 0, 1, 1));
-			bInDebugModeTextBox->SetVisibility(ESlateVisibility::Visible);
+			InDebugModeBorder->SetVisibility(ESlateVisibility::Visible);
+			InDebugModeText->SetVisibility(ESlateVisibility::Visible);
 		}
 		else{
-			bInDebugModeTextBox->SetText(FText::FromString(""));
+			InDebugModeBorder->SetVisibility(ESlateVisibility::Collapsed);
+			InDebugModeText->SetVisibility(ESlateVisibility::Collapsed);
 		}
 	}
 }
@@ -99,7 +99,7 @@ void USFHUDWidget::ClearWidget()
 FHUDSavedData USFHUDWidget::GetData()
 {
 	FHUDSavedData Data;
-	Data.bInDebugMode = bInDebugMode; // TODO: Do we want to save, whether data has been collected in debug mode? Or should we treat it the same? What happens, if the first half is collected in debug mode, the second half in normal mode
+	//Data.bInDebugMode = bInDebugMode; // TODO: Do we want to save, whether data has been collected in debug mode? Or should we treat it the same? What happens, if the first half is collected in debug mode, the second half in normal mode
 	Data.Status = StatusTextBox->GetText().ToString();
 	Data.Participant = ParticipantTextBox->GetText().ToString();
 	Data.Phase = PhaseTextBox->GetText().ToString();
diff --git a/Source/StudyFrameworkPlugin/Private/HUD/SFMasterHUD.cpp b/Source/StudyFrameworkPlugin/Private/HUD/SFMasterHUD.cpp
index bc768fad2e5d85b466543a5255b64525797710b1..b91bdd7e9b398df6e01a271cc3fa503c45774e6a 100644
--- a/Source/StudyFrameworkPlugin/Private/HUD/SFMasterHUD.cpp
+++ b/Source/StudyFrameworkPlugin/Private/HUD/SFMasterHUD.cpp
@@ -83,7 +83,7 @@ void ASFMasterHUD::BeginPlay()
 	FHUDSavedData& Data = USFGameInstance::Get()->HUDSavedData;
 
 	HUDWidget->SetData(Data);
-	HUDWidget->SetbInDebugMode(bInDebugMode);
+	HUDWidget->SetbInDebugMode(USFGameInstance::Get()->IsInDebugMode());
 
 	if(UnForwardedParticipant)
 	{
@@ -198,14 +198,6 @@ void ASFMasterHUD::SetNextConditionButtonVisibility(ESlateVisibility Visibility)
 	HUDWidget->GetNextButton()->SetVisibility(Visibility);
 }
 
-void ASFMasterHUD::SetbInDebugMode(bool InDebugMode)
-{
-	bInDebugMode = InDebugMode;
-	if (HUDWidget) {
-		HUDWidget->SetbInDebugMode(InDebugMode);
-	}
-}
-
 void ASFMasterHUD::DrawBackground()
 {
 	FLinearColor BackgroundColor = FLinearColor::Black;
diff --git a/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp b/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
index 43e201a9fc88b64f104fbd4d56d03c3dd9c8c604..992ac5a2ef3572a5665f8ef1b23787d73f773ead 100644
--- a/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
+++ b/Source/StudyFrameworkPlugin/Private/SFGameInstance.cpp
@@ -155,8 +155,8 @@ void USFGameInstance::RestoreLastParticipantForDebugStart(USFCondition* InStartC
 
 	Participant->Initialize(ParticipantSequenceNumber, ParticipantID);
 	Participant->LoadConditionsFromJson();
-	Cast<ASFMasterHUD>(GetWorld()->GetFirstPlayerController()->GetHUD())->SetbInDebugMode(true); //Display notification in HUD, that we are in debug mode
-	
+	bInDebugMode = true;
+
 	InitFadeHandler(StudySetup->FadeConfig);
 
 	StartCondition = InStartCondition;
@@ -604,6 +604,11 @@ bool USFGameInstance::IsStarted() const
 	return bStudyStarted;
 }
 
+bool USFGameInstance::IsInDebugMode() const
+{
+	return bInDebugMode;
+}
+
 bool USFGameInstance::HasEnded() const
 {
 	return bStudyEnded;
diff --git a/Source/StudyFrameworkPlugin/Public/HUD/SFHUDWidget.h b/Source/StudyFrameworkPlugin/Public/HUD/SFHUDWidget.h
index 95b5830fc425f174a8c3303a5d3f1bb14e732147..33f70e589b88b256de51ccf4a562783ddf0613d7 100644
--- a/Source/StudyFrameworkPlugin/Public/HUD/SFHUDWidget.h
+++ b/Source/StudyFrameworkPlugin/Public/HUD/SFHUDWidget.h
@@ -17,7 +17,6 @@ USTRUCT()
 struct FHUDSavedData
 {
 	GENERATED_BODY()
-	bool bInDebugMode;
 	FString Status;
 	FString Participant;
 	FString Phase;
@@ -65,7 +64,8 @@ private:
 
 	// Notiy user in HUD, if level is used in Debug-Mode
 	bool bInDebugMode = false;
-	UPROPERTY(EditAnywhere, meta = (BindWidget)) UTextBlock* bInDebugModeTextBox;
+	UPROPERTY(EditAnywhere, meta = (BindWidget)) UBorder* InDebugModeBorder;
+	UPROPERTY(EditAnywhere, meta = (BindWidget)) UTextBlock* InDebugModeText;
 
 	UPROPERTY(EditAnywhere, meta = (BindWidget)) UTextBlock* StatusTextBox;
 	UPROPERTY(EditAnywhere, meta = (BindWidget)) UTextBlock* ParticipantTextBox;
diff --git a/Source/StudyFrameworkPlugin/Public/HUD/SFMasterHUD.h b/Source/StudyFrameworkPlugin/Public/HUD/SFMasterHUD.h
index 619c1c6195cc05bc799082edf20b6db3df85e579..23fdb7212e40039f1c9ef0b85cc48f9f4b6b4321 100644
--- a/Source/StudyFrameworkPlugin/Public/HUD/SFMasterHUD.h
+++ b/Source/StudyFrameworkPlugin/Public/HUD/SFMasterHUD.h
@@ -49,9 +49,6 @@ public:
 	UFUNCTION()
 	void SetNextConditionButtonVisibility(ESlateVisibility Visibility);
 
-	UFUNCTION()
-		void SetbInDebugMode(bool InDebugMode);
-
 	UPROPERTY(EditDefaultsOnly, Category = "Interactive")
 	TSubclassOf<USFHUDWidget> SFWidgetClass;
 	UPROPERTY(EditDefaultsOnly, Category = "Interactive")
@@ -78,8 +75,6 @@ private:
 	void DrawBackground();
 	float BackgroundAlpha = 1.0f;
 
-	bool bInDebugMode=false;
-
 	ASFHMDSpectatorHUDHelp* HMDHUDHelper;
 	bool bHMDHUDHelperTextureSet= false;
 
diff --git a/Source/StudyFrameworkPlugin/Public/SFGameInstance.h b/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
index 9032efce886766f8c4664313908a9e7a7c9e46e1..c4c1b5e40275f200d7b5c2f8e5ba64fe2efc7010 100644
--- a/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
+++ b/Source/StudyFrameworkPlugin/Public/SFGameInstance.h
@@ -69,6 +69,10 @@ public:
 	UFUNCTION(BlueprintCallable)
 	bool IsStarted() const;
 
+	UFUNCTION(BlueprintCallable)
+	bool IsInDebugMode() const;
+
+
 	//Whether the study is done (this is actually only true for a short duration), as once faded out Unreal is quit
 	UFUNCTION(BlueprintCallable)
 	bool HasEnded() const;
@@ -237,6 +241,7 @@ protected:
 	USFCondition* ConditionToStartAtInit=nullptr;
 
 	bool bStartedOnUnrelatedMap = false;
+	bool bInDebugMode = false;
 
 	UPROPERTY()
 	USFGazeTracker* GazeTracker;