diff --git a/lisp/org-html.el b/lisp/org-html.el
index 547763ae6..a12141f44 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -579,13 +579,10 @@ description.  See variables `org-export-html-inline-images' and
    (declare (special
 	     org-export-html-inline-images
 	     org-export-html-inline-image-extensions))
-   (or
-      (eq t org-export-html-inline-images)
-      (and
-	 org-export-html-inline-images
-	 (not descp)))
-   (org-file-image-p
-      filename org-export-html-inline-image-extensions))
+   (and (or (eq t org-export-html-inline-images)
+	    (and org-export-html-inline-images (not descp)))
+	(org-file-image-p
+	 filename org-export-html-inline-image-extensions)))
 
 ;;; org-html-make-link
 (defun org-html-make-link (opt-plist type path fragment desc attr