diff --git a/src/main/java/com/bakdata/common_kafka_streams/KafkaStreamsApplication.java b/src/main/java/com/bakdata/common_kafka_streams/KafkaStreamsApplication.java
index b94a05e21..45ee1567e 100644
--- a/src/main/java/com/bakdata/common_kafka_streams/KafkaStreamsApplication.java
+++ b/src/main/java/com/bakdata/common_kafka_streams/KafkaStreamsApplication.java
@@ -153,11 +153,11 @@ public void run() {
     @Override
     public void close() {
         log.info("Stopping application");
-        this.closeResources();
-        if (this.streams == null) {
-            return;
+        if (this.streams != null) {
+            this.streams.close();
         }
-        this.streams.close();
+        // close resources after streams because messages currently processed might depend on resources
+        this.closeResources();
     }
 
     public abstract void buildTopology(StreamsBuilder builder);