diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 36994ee0..c6feb3b5 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -2173,10 +2173,6 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 
 	case TC_APPMSG_PREBOOT_PASSWORD_MODE:
 		{
-			/* No support for mounting TrueCrypt system partition */				
-			SetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE, FALSE);
-			EnableWindow (GetDlgItem (hwndDlg, IDC_TRUECRYPT_MODE), FALSE);
-
 			/* Repopulate the PRF algorithms list with algorithms that support system encryption */
 			HWND hComboBox = GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID);
 			SendMessage (hComboBox, CB_RESETCONTENT, 0, 0);
diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp
index f1f248ba..51ebf300 100755
--- a/src/Volume/Volume.cpp
+++ b/src/Volume/Volume.cpp
@@ -106,9 +106,6 @@ namespace VeraCrypt
 		if (kdf && truecryptMode && (kdf->GetName() == L"HMAC-SHA-256"))
 			throw UnsupportedAlgoInTrueCryptMode (SRC_POS);	
 
-		if (truecryptMode && partitionInSystemEncryptionScope)
-			throw ParameterIncorrect (SRC_POS);
-
 		Protection = protection;
 		VolumeFile = volumeFile;
 		SystemEncryption = partitionInSystemEncryptionScope;