diff --git a/bazarr/main.py b/bazarr/main.py
index f022083e3..f5a1e38de 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -608,7 +608,7 @@ def edit_series(no):
         lang = 'None'
 
     single_language = settings.general.getboolean('single_language')
-    if single_language is True:
+    if single_language:
         if str(lang) == "['None']":
             lang = 'None'
         else:
@@ -805,8 +805,15 @@ def edit_movie(no):
     else:
         lang = 'None'
 
-    if str(lang) == "['']":
-        lang = '[]'
+    single_language = settings.general.getboolean('single_language')
+    if single_language:
+        if str(lang) == "['None']":
+            lang = 'None'
+        else:
+            lang = str(lang)
+    else:
+        if str(lang) == "['']":
+            lang = '[]'
 
     hi = request.forms.get('hearing_impaired')
 
diff --git a/views/movie.tpl b/views/movie.tpl
index 6444c3d1b..f43ef0a0b 100644
--- a/views/movie.tpl
+++ b/views/movie.tpl
@@ -249,6 +249,9 @@
 									<div class="nine wide column">
 										<select name="languages" id="movie_languages" {{!'multiple="" ' if single_language is False else ''}} class="ui fluid selection dropdown">
 											<option value="">Languages</option>
+											%if single_language:
+                                        	<option value="None">None</option>
+                                        	%end
 											%for language in languages:
 											<option value="{{language[0]}}">{{language[1]}}</option>
 											%end
diff --git a/views/movies.tpl b/views/movies.tpl
index 68d120078..284392766 100644
--- a/views/movies.tpl
+++ b/views/movies.tpl
@@ -182,6 +182,9 @@
 									<div class="nine wide column">
 										<select name="languages" id="movies_languages" {{!'multiple="" ' if single_language is False else ''}}class="ui fluid selection dropdown">
 											<option value="">Languages</option>
+											%if single_language:
+                                        	<option value="None">None</option>
+                                        	%end
 											%for language in languages:
 											<option value="{{language[0]}}">{{language[1]}}</option>
 											%end
diff --git a/views/series.tpl b/views/series.tpl
index 51a570970..39d0db749 100644
--- a/views/series.tpl
+++ b/views/series.tpl
@@ -94,7 +94,7 @@
 								%end
 							%end
 						</td>
-						<td>{{!"" if row[4] == None else row[4]}}</td>
+						<td>{{!"" if row[4] is None else row[4]}}</td>
 						<td>
 							%total_subs = 0
 							%missing_subs = 0
@@ -199,7 +199,7 @@
 									<div class="nine wide column">
 										<select name="languages" id="series_languages" {{!'multiple="" ' if single_language is False else ''}}class="ui fluid selection dropdown">
 											<option value="">Languages</option>
-											%if single_language is True:
+											%if single_language:
                                         	<option value="None">None</option>
                                         	%end
 											%for language in languages: