diff --git a/apps/decoder.c b/apps/decoder.c
index 0b1c48ddb13f3915bed5185ecf1e56dcd56040aa..9b200437860261752c15aebf2de04a26be3f9bb8 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -80,9 +80,13 @@ static
 #define NUM_BITS_SID_IVAS_5K2     104
 
 #endif
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+#define RANDOM_INITSEED_DEC ( 0xFADE )
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
 #define RANDOM_INITSEED_DEC ( 0xFEEDFADE )
 #endif
+#endif
 
 /*------------------------------------------------------------------------------------------*
  * Local structure for storing cmdln arguments
@@ -2050,6 +2054,14 @@ static ivas_error initOnFirstGoodFrame(
         int16_t splitRendIsarFrameSizeMs;
         int16_t lc3plusHighRes;
 
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+        /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
+           use fixed seed for random num generator for regression based tests. Any realtime
+           application should implement this initialization seperately */
+        uint16_t rtpDecSeed = RANDOM_INITSEED_DEC;
+        uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );
+        uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
         /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
         use fixed seed for random num generator for regression based tests. Any realtime
@@ -2057,6 +2069,7 @@ static ivas_error initOnFirstGoodFrame(
         srand( RANDOM_INITSEED_DEC );
         uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );
         uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );
+#endif
 #endif
 
         if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )
diff --git a/apps/encoder.c b/apps/encoder.c
index 505e66a282789715f38ebea25be0052adf2566d7..2c9c42b462a56e4a5e1d4cd83e08d86f49f9120d 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -61,9 +61,13 @@ static
 #endif
     int32_t frame = 0; /* Counter of frames */
 
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+#define RANDOM_INITSEED_ENC ( 0xDEAF )
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
 #define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )
 #endif
+#endif
 
 #define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
 
@@ -234,6 +238,14 @@ int main(
     IVAS_RTP ivasRtp = { 0 };
 #endif
 
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
+       use fixed seed for random num generator for regression based tests. Any realtime
+       application should implement this initialization seperately */
+    uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;
+    uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );
+    uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
     /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
        use fixed seed for random num generator for regression based tests. Any realtime
@@ -241,6 +253,7 @@ int main(
     srand( RANDOM_INITSEED_ENC );
     uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );
     uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );
+#endif
 #endif
 
     /*------------------------------------------------------------------------------------------*
diff --git a/apps/encoder_fmtsw.c b/apps/encoder_fmtsw.c
index 2a990abae174d75354a423e6714b9d51ba956bc5..1730018f8e4bd4b255f0445b211ccafdf230390b 100644
--- a/apps/encoder_fmtsw.c
+++ b/apps/encoder_fmtsw.c
@@ -64,9 +64,13 @@ static
 #endif
     int32_t frame = 0; /* Counter of frames */
 
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+#define RANDOM_INITSEED_ENC ( 0xDEAF )
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
 #define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )
 #endif
+#endif
 
 #define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
 
@@ -359,6 +363,14 @@ int encoder_main(
     /* IVAS_RTP ivasRtp = { 0 }; */
 #endif
 
+#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS
+    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
+       use fixed seed for random num generator for regression based tests. Any realtime
+       application should implement this initialization seperately */
+    uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;
+    uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );
+    uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );
+#else
 #ifdef FIXED_RTP_SEQUENCE_NUM
     /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
        use fixed seed for random num generator for regression based tests. Any realtime
@@ -366,6 +378,7 @@ int encoder_main(
     srand( RANDOM_INITSEED_ENC );
     uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );
     uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );
+#endif
 #endif
 
     /*------------------------------------------------------------------------------------------*
diff --git a/lib_com/options.h b/lib_com/options.h
index 560d3e0a0ad105d8362186f17ba05bf5b830cb4f..1f09b730806f3a4d858dfc432657f623e79f3192 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -211,6 +211,8 @@
 #define FIX_1430_EVS_STEREO_DMX_CHANNEL_DISAPPEARING    /* Orange: Fix for basop issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */
 #define FIX_1440_AMR_WB_RESET                           /* VA: issue 1440: Fix missing AMR-WB IO memory reset (applicable to float only) */
 
+#define NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS /* Nokia: fix basop issue 2233: Fix differing rtpdump streams */
+
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_util/ivas_rtp_file.c b/lib_util/ivas_rtp_file.c
index 65f9fec15d9001ac0b0917565406d0e4c15fad58..b8e79fad53158de060083438cabeaac72fe0d7cb 100644
--- a/lib_util/ivas_rtp_file.c
+++ b/lib_util/ivas_rtp_file.c
@@ -1103,3 +1103,10 @@ ivas_error IVAS_RTP_ReadNextFrame(
 
     return IVAS_ERR_OK;
 }
+
+uint16_t IVAS_RTP_OwnRandom( uint16_t *seed )
+{
+    *seed = (uint16_t) ( *seed * 31821L + 13849L );
+
+    return ( *seed );
+}
diff --git a/lib_util/ivas_rtp_file.h b/lib_util/ivas_rtp_file.h
index 684903e17533f07c67c17e36b153f68f91da7d26..b57d387cf449846fb24dc2257669b93f1f9466d1 100644
--- a/lib_util/ivas_rtp_file.h
+++ b/lib_util/ivas_rtp_file.h
@@ -93,5 +93,6 @@ ivas_error IVAS_RTP_ReadNextFrame( IVAS_RTP *rtp, uint8_t *au, int16_t *auSizeBi
 void IVAS_RTP_LogPiData( FILE *f_piDataOut, const PIDATA_TS *piData, uint32_t nPiDataPresent );
 void IVAS_RTP_WriteExtPiData( FILE *f_piDataOut, const PIDATA_TS *piData, uint32_t nPiDataPresent, uint16_t numObj );
 const char *IVAS_RTP_GetExtPiFilePath( IVAS_RTP *rtp );
+uint16_t IVAS_RTP_OwnRandom( uint16_t *seed );
 
 #endif /* IVAS_RTP_FILE_H */