diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fb4980..b976edc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 - Feature: Verification checkmark for friends   
 - Fix: Added contacts in contact sharing where not click able
+- Fix: Open chat after the image expires in case a draft message exists 
 - Fix: Restore flames as a plus user
 - Fix: Route not found when sharing image
 - Fix: Increase recent limit in emoji keyboard
diff --git a/lib/src/views/chats/media_viewer.view.dart b/lib/src/views/chats/media_viewer.view.dart
index 0d6f132..ba1842f 100644
--- a/lib/src/views/chats/media_viewer.view.dart
+++ b/lib/src/views/chats/media_viewer.view.dart
@@ -4,10 +4,12 @@ import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
 import 'package:no_screenshot/no_screenshot.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart'
     show DownloadState, MediaType;
@@ -153,7 +155,16 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     progressTimer?.cancel();
 
     if (allMediaFiles.isEmpty) {
-      Navigator.pop(context);
+      final group = await twonlyDB.groupsDao.getGroup(widget.group.groupId);
+      if (mounted) {
+        if (group != null &&
+            group.draftMessage != null &&
+            group.draftMessage != '') {
+          context.replace(Routes.chatsMessages, extra: group);
+        } else {
+          Navigator.pop(context);
+        }
+      }
     } else {
       await loadCurrentMediaFile();
     }