diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 82a7464bd911bfd60732a203eafd5478cf70d464..6f534c6b8eae5333ff4c062b8fad72d0599ca81a 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -102,7 +102,6 @@
 
 
 
-#define JVET_Q0816                                        1 // JVET_Q0816: Omit the signalling of subpic layout when there is only one subpicture
 
 #define JVET_Q0438_MONOCHROME_BUGFIXES                    1 // JVET-Q0438: Monochrome bug fixes
 
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index fe652b0366140c35519780fe8eeece044e195007..26159f300f1060d50f3eb702802806b847f065d3 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1487,7 +1487,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
     }
 #endif
 
-#if JVET_Q0816
     if( pcSPS->getNumSubPics() == 1 )
     {
       pcSPS->setSubPicCtuTopLeftX( 0, 0 );
@@ -1499,7 +1498,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
     }
     else
     {
-#endif
     for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
     {
 #if JVET_Q0787_SUBPIC
@@ -1574,9 +1572,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
       READ_FLAG(uiCode, "loop_filter_across_subpic_enabled_flag[ i ]");
       pcSPS->setLoopFilterAcrossSubpicEnabledFlag(picIdx, uiCode);
     }
-#if JVET_Q0816
     }
-#endif
 
 #if JVET_Q0119_CLEANUPS
     READ_UVLC( uiCode, "sps_subpic_id_len_minus1" );                       pcSPS->setSubPicIdLen( uiCode + 1 );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 5b1028ffe5c4a669cba66447745ce05bcbb9b237..b37ccc550f4c79f35ff4d1dcb04a3a53b8ac548f 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -968,10 +968,8 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
 #else
     WRITE_CODE(pcSPS->getNumSubPics() - 1, 8, "sps_num_subpics_minus1");
 #endif
-#if JVET_Q0816
     if( pcSPS->getNumSubPics() > 1 )
     {
-#endif
     for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
     {
 #if JVET_Q0787_SUBPIC
@@ -1015,9 +1013,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
       WRITE_FLAG( pcSPS->getSubPicTreatedAsPicFlag(picIdx),  "subpic_treated_as_pic_flag[ i ]" );
       WRITE_FLAG( pcSPS->getLoopFilterAcrossSubpicEnabledFlag(picIdx),  "loop_filter_across_subpic_enabled_flag[ i ]" );
     }
-#if JVET_Q0816
     }
-#endif
 
 #if JVET_Q0119_CLEANUPS
     CHECK(pcSPS->getSubPicIdLen() < 1, "SPS: SubPicIdLen cannot be less than 1");