diff --git a/core/defuns-text.el b/core/defuns-text.el
index 1c453faab..68653b178 100644
--- a/core/defuns-text.el
+++ b/core/defuns-text.el
@@ -115,9 +115,9 @@ spaces on either side of the point if so. Resorts to
    ((sp-point-in-string)
     (newline))
    ((sp-point-in-comment)
-    (if (eq major-mode 'js2-mode)
-        (js2-line-break)
-      (indent-new-comment-line)))
-   (t
-    (newline-and-indent)
-    (ignore-errors (indent-sexp)))))
+    (cond ((eq major-mode 'js2-mode)
+           (js2-line-break))
+          ((-contains? '(c-mode c++-mode objc-mode java-mode) major-mode)
+           (c-indent-new-comment-line))
+          (t (indent-new-comment-line))))
+   (t (newline-and-indent))))