diff --git a/lib/src/widgets/utils/ds_circular_progress.widget.dart b/lib/src/widgets/utils/ds_circular_progress.widget.dart
index 7166996f..68868768 100644
--- a/lib/src/widgets/utils/ds_circular_progress.widget.dart
+++ b/lib/src/widgets/utils/ds_circular_progress.widget.dart
@@ -42,10 +42,11 @@ class DSCircularProgress extends StatelessWidget {
                       : null,
                 ),
               ),
-              DSCaptionSmallText(
-                _buildProgress(),
-                color: foregroundColor ?? DSColors.neutralDarkCity,
-              )
+              if (currentProgress.value > 0 && maximumProgress.value > 0)
+                DSCaptionSmallText(
+                  _buildProgress(),
+                  color: foregroundColor ?? DSColors.neutralDarkCity,
+                )
             ],
           ),
         );
diff --git a/lib/src/widgets/utils/ds_expanded_image.widget.dart b/lib/src/widgets/utils/ds_expanded_image.widget.dart
index a1d0f797..51abf4bf 100644
--- a/lib/src/widgets/utils/ds_expanded_image.widget.dart
+++ b/lib/src/widgets/utils/ds_expanded_image.widget.dart
@@ -165,23 +165,18 @@ class DSExpandedImage extends StatelessWidget {
         ),
       );
 
-  Widget _buildLoading() => Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsets.symmetric(
-              vertical: 8.0,
-            ),
-            child: Center(
-              child: DSSpinnerLoading(
-                color: style.isLightBubbleBackground(align)
-                    ? DSColors.primaryNight
-                    : DSColors.neutralLightSnow,
-                size: 32.0,
-                lineWidth: 4.0,
-              ),
-            ),
+  Widget _buildLoading() => Center(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(
+            vertical: 8.0,
           ),
-        ],
+          child: DSSpinnerLoading(
+            color: style.isLightBubbleBackground(align)
+                ? DSColors.primaryNight
+                : DSColors.neutralLightSnow,
+            size: 32.0,
+            lineWidth: 4.0,
+          ),
+        ),
       );
 }