diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e14709b7b..be8eca71c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 android {
     namespace = "de.tum.informatics.www1.artemis.native_app.android"
 
-    val versionName = "2.1.2"
+    val versionName = "2.1.3"
     val versionCode = 624
 
     setProperty("archivesBaseName", "artemis-android-$versionName-$versionCode")
diff --git a/feature/metis/conversation/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/shared/ui/util/ForwardedMessagesHandler.kt b/feature/metis/conversation/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/shared/ui/util/ForwardedMessagesHandler.kt
index 4ee2b9bb0..5672db9bd 100644
--- a/feature/metis/conversation/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/shared/ui/util/ForwardedMessagesHandler.kt
+++ b/feature/metis/conversation/shared/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/shared/ui/util/ForwardedMessagesHandler.kt
@@ -45,6 +45,10 @@ class ForwardedMessagesHandler(
      * @param postingType The type of the destination posts for which the forwarded messages should be loaded.
      */
     suspend fun loadForwardedMessages(postingType: PostingType) {
+        if (forwardedPostIds.isEmpty()) {
+            // Do not make a server request if there are no forwarded messages to fetch
+            return
+        }
         metisService.getForwardedMessagesByIds(
             metisContext = metisContext,
             postIds = forwardedPostIds,
@@ -184,4 +188,4 @@ class ForwardedMessagesHandler(
             else -> return this
         }
     }
-}
\ No newline at end of file
+}