diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py
index 25765bf777..61329090e0 100644
--- a/cura/UI/WelcomePagesModel.py
+++ b/cura/UI/WelcomePagesModel.py
@@ -76,6 +76,7 @@ class WelcomePagesModel(ListModel):
         if next_page_index == len(self._items):
             self.allFinished.emit()
             self.resetState()
+            return
 
         # Move to the next page
         self._setCurrentPageIndex(next_page_index)
diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml
index 57f2873e80..39e9116c8c 100644
--- a/resources/qml/WelcomePages/WizardPanel.qml
+++ b/resources/qml/WelcomePages/WizardPanel.qml
@@ -25,7 +25,7 @@ Item
 
     // Convenience properties
     property var progressValue: model == null ? 0 : model.currentProgress
-    property string pageUrl: currentItem == null ? null : currentItem.page_url
+    property string pageUrl: currentItem == null ? "" : currentItem.page_url
 
     signal showNextPage()
     signal showPreviousPage()