diff --git a/apps/decoder.c b/apps/decoder.c
index c658acff9f72c57345da4aea9e579a5f2962e512..4ca4fdd010a6ebfbe582b56a03e9f1e33e1f7565 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -2891,6 +2891,13 @@ cleanup:
 #ifdef SUPPORT_JBM_TRACEFILE
     JbmTraceFileWriter_close( &jbmTraceWriter );
 #endif
+#ifdef FIX_683_JBM_CLEANUP
+    MasaFileWriter_close( &masaWriter );
+    for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )
+    {
+        IsmFileWriter_close( &ismWriters[i] );
+    }
+#endif
 
     if ( decodingFailed && error == IVAS_ERR_OK )
     {
diff --git a/lib_com/options.h b/lib_com/options.h
index 6d126861a2105cb30bb7278ff30c4080df908de4..f864c9fee1803e7b4f517bdeba181e1215cbb5cf 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -240,6 +240,7 @@
 #define FIX_657_REMOVE_EDITING                          /* Nokia: Remove remaining unused coded related to object editing */
 #define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */
 #define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
+#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */
 
 /* ################## End BE DEVELOPMENT switches ######################### */