diff --git a/bazarr/app/ui.py b/bazarr/app/ui.py
index c5bd41736..7d8162430 100644
--- a/bazarr/app/ui.py
+++ b/bazarr/app/ui.py
@@ -24,9 +24,15 @@ ui_bp = Blueprint('ui', __name__,
                                              'build', 'assets'),
                   static_url_path='/assets')
 
+if os.path.exists(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),'frontend', 'build',
+                               'images')):
+    static_directory = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'frontend', 'build',
+                                    'images')
+else:
+    static_directory = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'frontend', 'public',
+                                    'images')
 static_bp = Blueprint('images', __name__,
-                      static_folder=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
-                                                 'frontend', 'build', 'images'), static_url_path='/images')
+                      static_folder=static_directory, static_url_path='/images')
 
 ui_bp.register_blueprint(static_bp)