diff --git a/lisp/org-element.el b/lisp/org-element.el
index 50a5628c6..9fcecf5bf 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4560,9 +4560,8 @@ to interpret.  Return Org syntax as a string."
 		(if (memq type '(org-data plain-text nil)) results
 		  ;; Build white spaces.  If no `:post-blank' property
 		  ;; is specified, assume its value is 0.
-		  (let ((blank (or (org-element-property :post-blank data) 0))
-			(class (org-element-class data parent)))
-		    (if (eq class 'object)
+		  (let ((blank (or (org-element-property :post-blank data) 0)))
+		    (if (eq (org-element-class data parent) 'object)
 			(concat results (make-string blank ?\s))
 		      (concat (org-element--interpret-affiliated-keywords data)
 			      (org-element-normalize-string results)
diff --git a/lisp/ox.el b/lisp/ox.el
index a99cbf949..a41b7d71e 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1988,9 +1988,8 @@ Return a string."
 	    (t
 	     (org-export-filter-apply-functions
 	      (plist-get info (intern (format ":filter-%s" type)))
-	      (let ((blank (or (org-element-property :post-blank data) 0))
-		    (class (org-element-class data parent)))
-		(if (eq class 'object)
+	      (let ((blank (or (org-element-property :post-blank data) 0)))
+		(if (eq (org-element-class data parent) 'object)
 		    (concat results (make-string blank ?\s))
 		  (concat (org-element-normalize-string results)
 			  (make-string blank ?\n))))