diff --git a/src/Content/Conversation/Repository/UserDefinedChannel.php b/src/Content/Conversation/Repository/UserDefinedChannel.php
index 6515bc7196..78386f890a 100644
--- a/src/Content/Conversation/Repository/UserDefinedChannel.php
+++ b/src/Content/Conversation/Repository/UserDefinedChannel.php
@@ -134,7 +134,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
 			'max-size'         => $Channel->maxSize,
 			'full-text-search' => $Channel->fullTextSearch,
 			'media-type'       => $Channel->mediaType,
-			'languages'        => serialize($Channel->languages),
+			'languages'        => !empty($Channel->languages) ? serialize($Channel->languages) : null,
 			'publish'          => $Channel->publish,
 			'valid'            => $this->isValid($Channel->fullTextSearch),
 		];
diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php
index a1b5949ede..c581e0c609 100644
--- a/src/Module/Settings/Channels.php
+++ b/src/Module/Settings/Channels.php
@@ -101,7 +101,7 @@ class Channels extends BaseSettings
 				continue;
 			}
 
-			if (!array_diff((array)$request['languages'][$id], $channel_languages)) {
+			if (!array_diff((array)$request['languages'][$id], $channel_languages) && (count((array)$request['languages'][$id]) == count($channel_languages))) {
 				$request['languages'][$id] = null;
 			}