diff --git a/imgboard.php b/imgboard.php
index 2169965..d3d59f5 100644
--- a/imgboard.php
+++ b/imgboard.php
@@ -405,7 +405,7 @@ if (!isset($_GET['delete']) && !isset($_GET['manage']) && (isset($_POST['name'])
 
 	if ($post['file'] == '') { // No file uploaded
 		$file_ok = !empty($tinyib_uploads) && ($rawpost || !in_array('file', $hide_fields));
-		$embed_ok = !empty($tinyib_embeds) && ($rawpost || !in_array('embed', $hide_fields));
+		$embed_ok = (!empty($tinyib_embeds) || TINYIB_UPLOADVIAURL) && ($rawpost || !in_array('embed', $hide_fields));
 		$allowed = '';
 		if ($file_ok && $embed_ok) {
 			$allowed = __('upload a file or embed a URL');
diff --git a/inc/html.php b/inc/html.php
index 2694244..f6b71ae 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -184,8 +184,8 @@ EOF;
 EOF;
 	}
 
-	$embeds_enabled = !empty($tinyib_embeds) && ($raw_post || !in_array('embed', $hide_fields));
-	if (TINYIB_UPLOADVIAURL || $embeds_enabled) {
+	$embeds_enabled = (!empty($tinyib_embeds) || TINYIB_UPLOADVIAURL) && ($raw_post || !in_array('embed', $hide_fields));
+	if ($embeds_enabled) {
 		$txt_embed = __('Embed');
 		$txt_embed_help = '';
 		if ($embeds_enabled) {