diff --git a/lib/common/widgets/image_viewer/loading_indicator.dart b/lib/common/widgets/image_viewer/loading_indicator.dart
index 3835e6980..e44850dee 100644
--- a/lib/common/widgets/image_viewer/loading_indicator.dart
+++ b/lib/common/widgets/image_viewer/loading_indicator.dart
@@ -100,9 +100,7 @@ class RenderLoadingIndicator extends RenderBox {
         ..drawCircle(
           center,
           radius,
-          paint
-            ..strokeWidth = strokeWidth
-            ..color = Colors.white,
+          paint..color = Colors.white,
         )
         ..drawCircle(
           center,
diff --git a/lib/common/widgets/image_viewer/viewer.dart b/lib/common/widgets/image_viewer/viewer.dart
index d7703ac93..7a579726e 100644
--- a/lib/common/widgets/image_viewer/viewer.dart
+++ b/lib/common/widgets/image_viewer/viewer.dart
@@ -406,6 +406,9 @@ class _ViewerState extends State<Viewer> with SingleTickerProviderStateMixin {
     }
     final containerWidth = widget.containerSize.width;
     final imageWidth = _imageSize.width * _scale;
+    if (imageWidth <= containerWidth) {
+      return true;
+    }
     final dx = (1 - _scale) * containerWidth / 2;
     final dxOffset = (imageWidth - containerWidth) / 2;
     if (initialPosition.dx < lastPosition.global.dx) {