diff --git a/apps/renderer.c b/apps/renderer.c
index 0ba4fce8a6398e26df59e34b7859c3ef87da4b67..2c6d6fed6754b797445d47ac0af12c89f7d6e173 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -1179,7 +1179,7 @@ int main(
     /* Set reverb room size if specified */
     if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )
     {
-        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )
+        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError setting reverb room size\n" );
             goto cleanup;
diff --git a/lib_com/options.h b/lib_com/options.h
index 370a23aae8c749559c34449d11f9256cd55cea20..4a16a910be8843e3b159ac67de554a56ed9a69b6 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -170,6 +170,7 @@
 /* any switch which is non-be wrt. TS 26.258 V3.0 */
 
 #define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */
+#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index df8aaaf933005860562537644dcc450fe5904e95..265bc4bab5b1d637e203b5a2029e90afa01ae06b 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -4093,13 +4093,27 @@ ivas_error IVAS_REND_AddInput(
     setMaxGlobalDelayNs( hIvasRend );
 
     /* select default reverb size after adding an input */
+#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS
+    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )
+#else
     if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )
+#endif
     {
+#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS
+        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,
+                                                                                     hIvasRend->inputsMasa,
+                                                                                     hIvasRend->inputsMc,
+                                                                                     hIvasRend->inputsSba ) ) ) != IVAS_ERR_OK )
+        {
+            return error;
+        }
+#else
         IVAS_REND_SetReverbRoomSize( hIvasRend,
                                      getDefaultReverbSize( hIvasRend->inputsIsm,
                                                            hIvasRend->inputsMasa,
                                                            hIvasRend->inputsMc,
                                                            hIvasRend->inputsSba ) );
+#endif
     }
 
     return IVAS_ERR_OK;