From e107ff9645be0466d548ba1c59e864026a1d67cb Mon Sep 17 00:00:00 2001
From: Aleksey Semikozov <alwexy@gmail.com>
Date: Sun, 26 Apr 2026 09:49:27 +0000
Subject: [PATCH] Angular SSR - Guard against empty renderToString result and
 missing scrollAnimator

---
 packages/devextreme-angular/src/server/render.ts | 3 +++
 packages/devextreme/js/__internal/m_draggable.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/devextreme-angular/src/server/render.ts b/packages/devextreme-angular/src/server/render.ts
index 272acefd5cc9..1ea7b55f70ce 100644
--- a/packages/devextreme-angular/src/server/render.ts
+++ b/packages/devextreme-angular/src/server/render.ts
@@ -25,6 +25,9 @@ export class DxServerModule {
           temp.innerHTML = renderToString(el);
 
           const mainElement = temp.childNodes[0];
+          if (!mainElement) {
+            return;
+          }
           const childString = mainElement.innerHTML;
 
           for (let i = 0; i < mainElement.attributes.length; i++) {
diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts
index 194eca2e53cb..a97a6967a661 100644
--- a/packages/devextreme/js/__internal/m_draggable.ts
+++ b/packages/devextreme/js/__internal/m_draggable.ts
@@ -439,7 +439,7 @@ class Draggable extends DOMComponent<Draggable, Properties> {
   }
 
   _stopAnimator() {
-    this._scrollAnimator.stop();
+    this._scrollAnimator?.stop();
   }
 
   _addWidgetPrefix(className?) {