diff --git a/content.go b/content.go
index 4c33972..2cef019 100644
--- a/content.go
+++ b/content.go
@@ -14,10 +14,11 @@ func GetLanguageByContent(filename string, content []byte) (lang string, safe bo
 	ext := strings.ToLower(filepath.Ext(filename))
 	if fnMatcher, ok := matchers[ext]; ok {
 		lang, safe = fnMatcher(content)
-		return
+	} else {
+		lang = OtherLanguage
 	}
 
-	return GetLanguageByExtension(filename)
+	return
 }
 
 type languageMatcher func([]byte) (string, bool)
diff --git a/internal/code-generator/assets/content.go.tmpl b/internal/code-generator/assets/content.go.tmpl
index 332b3e7..c7a54c5 100644
--- a/internal/code-generator/assets/content.go.tmpl
+++ b/internal/code-generator/assets/content.go.tmpl
@@ -14,10 +14,11 @@ func GetLanguageByContent(filename string, content []byte) (lang string, safe bo
 	ext := strings.ToLower(filepath.Ext(filename))
 	if fnMatcher, ok := matchers[ext]; ok {
 		lang, safe = fnMatcher(content)
-		return
+	} else {
+		lang = OtherLanguage
 	}
 
-	return GetLanguageByExtension(filename)
+	return
 }
 
 type languageMatcher func ([]byte) (string, bool)
diff --git a/internal/code-generator/generator/test_files/content.gold b/internal/code-generator/generator/test_files/content.gold
index 608b4fa..b18141d 100644
--- a/internal/code-generator/generator/test_files/content.gold
+++ b/internal/code-generator/generator/test_files/content.gold
@@ -14,10 +14,11 @@ func GetLanguageByContent(filename string, content []byte) (lang string, safe bo
 	ext := strings.ToLower(filepath.Ext(filename))
 	if fnMatcher, ok := matchers[ext]; ok {
 		lang, safe = fnMatcher(content)
-		return
+	} else {
+		lang = OtherLanguage
 	}
 
-	return GetLanguageByExtension(filename)
+	return
 }
 
 type languageMatcher func([]byte) (string, bool)