diff --git a/public/app/features/dashboard/DashboardModel.ts b/public/app/features/dashboard/DashboardModel.ts
index a036e418c4b..ee057722869 100644
--- a/public/app/features/dashboard/DashboardModel.ts
+++ b/public/app/features/dashboard/DashboardModel.ts
@@ -669,6 +669,11 @@ export class DashboardModel {
     upgradeToGridLayout(old) {
       let yPos = 0;
       //let rowIds = 1000;
+      //
+
+      if (!old.rows) {
+        return;
+      }
 
       for (let row of old.rows) {
         let xPos = 0;