diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index 9da1880e5..86216f081 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -808,7 +808,10 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
 
     case Role_SortText:
       return item->SortText();
+    default:
+      return QVariant();
   }
+
   return QVariant();
 
 }
@@ -1871,6 +1874,7 @@ const CollectionModel::GroupBy &CollectionModel::Grouping::operator[](const int
     case 0: return first;
     case 1: return second;
     case 2: return third;
+    default: break;
   }
   qLog(Error) << "CollectionModel::Grouping[] index out of range" << i;
   return first;
@@ -1883,6 +1887,7 @@ CollectionModel::GroupBy &CollectionModel::Grouping::operator[](const int i) {
     case 0: return first;
     case 1: return second;
     case 2: return third;
+    default: break;
   }
   qLog(Error) << "CollectionModel::Grouping[] index out of range" << i;
 
diff --git a/src/context/contextalbumsmodel.cpp b/src/context/contextalbumsmodel.cpp
index dadea5685..3de8ba227 100644
--- a/src/context/contextalbumsmodel.cpp
+++ b/src/context/contextalbumsmodel.cpp
@@ -236,7 +236,11 @@ QVariant ContextAlbumsModel::data(const CollectionItem *item, int role) const {
 
     case Role_SortText:
       return item->SortText();
+
+    default:
+      return QVariant();
   }
+
   return QVariant();
 
 }
diff --git a/src/radios/radiomodel.cpp b/src/radios/radiomodel.cpp
index eaceef5ae..56faffc2c 100644
--- a/src/radios/radiomodel.cpp
+++ b/src/radios/radiomodel.cpp
@@ -123,6 +123,8 @@ QVariant RadioModel::data(const RadioItem *item, int role) const {
       if (service) return service->Donate();
       break;
     }
+    default:
+      return QVariant();
   }
 
   return QVariant();
diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp
index 9d389f546..bdf232e35 100644
--- a/src/smartplaylists/smartplaylistsmodel.cpp
+++ b/src/smartplaylists/smartplaylistsmodel.cpp
@@ -282,6 +282,8 @@ QVariant SmartPlaylistsModel::data(const QModelIndex &idx, const int role) const
     case Qt::DisplayRole:
     case Qt::ToolTipRole:
       return item->DisplayText();
+    default:
+      return QVariant();
   }
 
   return QVariant();