diff --git a/lib/entities/camera/widgets/camera_stream_view.dart b/lib/entities/camera/widgets/camera_stream_view.dart
index 4a29714..55170c5 100644
--- a/lib/entities/camera/widgets/camera_stream_view.dart
+++ b/lib/entities/camera/widgets/camera_stream_view.dart
@@ -105,14 +105,18 @@ class _CameraStreamViewState extends State<CameraStreamView> {
     Widget screenWidget;
     if (!_isLoaded) {
       screenWidget = Center(
-        child: EntityPicture()
+        child: EntityPicture(
+          fit: BoxFit.contain,
+        )
       );
     } else if (_entity.supportStream) {
       if (_videoPlayerController.value.initialized) {
         screenWidget = VideoPlayer(_videoPlayerController);
       } else {
         screenWidget = Center(
-          child: EntityPicture()
+          child: EntityPicture(
+            fit: BoxFit.contain,
+          )
         );
       }
     } else {
diff --git a/lib/entities/entity_picture.widget.dart b/lib/entities/entity_picture.widget.dart
index a85cc60..99f4375 100644
--- a/lib/entities/entity_picture.widget.dart
+++ b/lib/entities/entity_picture.widget.dart
@@ -3,8 +3,9 @@ part of '../main.dart';
 class EntityPicture extends StatelessWidget {
 
   final EdgeInsetsGeometry padding;
+  final BoxFit fit;
   
-  const EntityPicture({Key key, this.padding: const EdgeInsets.all(0.0)}) : super(key: key);
+  const EntityPicture({Key key, this.padding: const EdgeInsets.all(0.0), this.fit: BoxFit.cover}) : super(key: key);
 
   int getDefaultIconByEntityId(String entityId, String deviceClass, String state) {
     String domain = entityId.split(".")[0];
@@ -47,6 +48,7 @@ class EntityPicture extends StatelessWidget {
     if (data.entityPicture != null) {
       return CachedNetworkImage(
         imageUrl: data.entityPicture,
+        fit: this.fit,
         errorWidget: (context, _, __) => iconPicture,
         placeholder: (context, _) => iconPicture,
       );